Browse Source

Platform/ Silicon/: Drop remnants of RVCT toolchain support

The RVCT toolchain family has been removed from EDK2 so let's get rid of
the remaining references to it. This includes .asm versions of assembler
source files that use a different idiom than GNU as.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Ard Biesheuvel 1 year ago
parent
commit
9577772ce0

+ 0 - 1
Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

@@ -250,7 +250,6 @@ DEFINE X64EMU_ENABLE  = FALSE
 ###################################################################################################
 
 [BuildOptions]
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
   GCC:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
 
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

+ 0 - 2
Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc

@@ -68,8 +68,6 @@
   *_*_ARM_PP_FLAGS  = -DARM_BIGLITTLE_TC2=1
 !endif
 
-  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7
-
   GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7
 
   XCODE:*_*_ARM_PLATFORM_FLAGS = -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7

+ 0 - 2
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc

@@ -268,8 +268,6 @@
 
 
 [BuildOptions]
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
-
   GCC:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
 
 ################################################################################

+ 1 - 2
Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf

@@ -31,8 +31,7 @@
 [Sources.common]
   CTA15-A7.c
   CTA15-A7Mem.c
-  CTA15-A7Helper.asm | RVCT
-  CTA15-A7Helper.S   | GCC
+  CTA15-A7Helper.S
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdCoreCount

+ 0 - 90
Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm

@@ -1,90 +0,0 @@
-//
-//  Copyright (c) 2012-2013, ARM Limited. All rights reserved.
-//
-//  SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-//
-
-#include <Library/ArmLib.h>
-
-#include <ArmPlatform.h>
-
-  INCLUDE AsmMacroIoLib.inc
-
-  EXPORT  ArmPlatformPeiBootAction
-  EXPORT  ArmPlatformGetCorePosition
-  EXPORT  ArmPlatformIsPrimaryCore
-  EXPORT  ArmPlatformGetPrimaryCoreMpId
-
-  PRESERVE8
-  AREA    CTA15A7Helper, CODE, READONLY
-
-ArmPlatformPeiBootAction FUNCTION
-  bx    lr
-  ENDFUNC
-
-//UINTN
-//ArmPlatformGetCorePosition (
-//  IN UINTN MpId
-//  );
-ArmPlatformGetCorePosition FUNCTION
-  and   r1, r0, #ARM_CORE_MASK
-  and   r0, r0, #ARM_CLUSTER_MASK
-  add   r0, r1, r0, LSR #7
-  bx    lr
-  ENDFUNC
-
-//UINTN
-//ArmPlatformIsPrimaryCore (
-//  IN UINTN MpId
-//  );
-ArmPlatformIsPrimaryCore FUNCTION
-  // Extract cpu_id and cluster_id from ARM_SCC_CFGREG48
-  // with cpu_id[0:3] and cluster_id[4:7]
-  mov32 r1, ARM_CTA15A7_SCC_CFGREG48
-  ldr   r1, [r1]
-  lsr   r1, #24
-
-  // Shift the SCC value to get the cluster ID at the offset #8
-  lsl   r2, r1, #4
-  and   r2, r2, #0xF00
-
-  // Keep only the cpu ID from the original SCC
-  and   r1, r1, #0x0F
-  // Add the Cluster ID to the Cpu ID
-  orr   r1, r1, r2
-
-  // Keep the Cluster ID and Core ID from the MPID
-  mov32 r2, ARM_CLUSTER_MASK :OR: ARM_CORE_MASK
-  and   r0, r0, r2
-
-  // Compare mpid and boot cpu from ARM_SCC_CFGREG48
-  cmp   r0, r1
-  moveq r0, #1
-  movne r0, #0
-  bx    lr
-  ENDFUNC
-
-//UINTN
-//ArmPlatformGetPrimaryCoreMpId (
-//  VOID
-//  );
-ArmPlatformGetPrimaryCoreMpId FUNCTION
-  // Extract cpu_id and cluster_id from ARM_SCC_CFGREG48
-  // with cpu_id[0:3] and cluster_id[4:7]
-  mov32 r0, ARM_CTA15A7_SCC_CFGREG48
-  ldr   r0, [r0]
-  lsr   r0, #24
-
-  // Shift the SCC value to get the cluster ID at the offset #8
-  lsl   r1, r0, #4
-  and   r1, r1, #0xF00
-
-  // Keep only the cpu ID from the original SCC
-  and   r0, r0, #0x0F
-  // Add the Cluster ID to the Cpu ID
-  orr   r0, r0, r1
-  bx    lr
-  ENDFUNC
-
-  END

+ 0 - 112
Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm

@@ -1,112 +0,0 @@
-//
-//  Copyright (c) 2011-2013, ARM Limited. All rights reserved.
-//
-//  SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-//
-
-#include <Base.h>
-#include <Library/ArmLib.h>
-#include <Library/PcdLib.h>
-
-#include <Chipset/ArmCortexA9.h>
-
-#include <AutoGen.h>
-
-  INCLUDE AsmMacroIoLib.inc
-
-  EXPORT    ArmPlatformPeiBootAction
-  EXPORT    ArmGetCpuCountPerCluster
-  EXPORT    ArmPlatformIsPrimaryCore
-  EXPORT    ArmPlatformGetPrimaryCoreMpId
-  EXPORT    ArmPlatformGetCorePosition
-
-  AREA RTSMHelper, CODE, READONLY
-
-ArmPlatformPeiBootAction FUNCTION
-  bx    lr
-  ENDFUNC
-
-// IN None
-// OUT r0 = SCU Base Address
-ArmGetScuBaseAddress FUNCTION
-  // Read Configuration Base Address Register. ArmCBar cannot be called to get
-  // the Configuration BAR as a stack is not necessary setup. The SCU is at the
-  // offset 0x0000 from the Private Memory Region.
-  mrc   p15, 4, r0, c15, c0, 0
-  bx  lr
-  ENDFUNC
-
-//UINTN
-//ArmPlatformGetPrimaryCoreMpId (
-//  VOID
-//  );
-ArmPlatformGetPrimaryCoreMpId FUNCTION
-  mov32 r0, FixedPcdGet32(PcdArmPrimaryCore)
-  bx    lr
-  ENDFUNC
-
-// IN None
-// OUT r0 = number of cores present in the system
-ArmGetCpuCountPerCluster FUNCTION
-  stmfd SP!, {r1-r2}
-
-  // Read CP15 MIDR
-  mrc   p15, 0, r1, c0, c0, 0
-
-  // Check if the CPU is A15
-  mov   r1, r1, LSR #4
-  mov   r0, #ARM_CPU_TYPE_MASK
-  and   r1, r1, r0
-
-  mov   r0, #ARM_CPU_TYPE_A15
-  cmp   r1, r0
-  beq   _Read_cp15_reg
-
-_CPU_is_not_A15
-  mov   r2, lr                              ; Save link register
-  bl    ArmGetScuBaseAddress                ; Read SCU Base Address
-  mov   lr, r2                              ; Restore link register val
-  ldr   r0, [r0, #A9_SCU_CONFIG_OFFSET]     ; Read SCU Config reg to get CPU count
-  b     _Return
-
-_Read_cp15_reg
-  mrc   p15, 1, r0, c9, c0, 2            ; Read C9 register of CP15 to get CPU count
-  lsr   r0, #24
-
-
-_Return
-  and   r0, r0, #3
-  // Add '1' to the number of CPU on the Cluster
-  add   r0, r0, #1
-  ldmfd SP!, {r1-r2}
-  bx lr
-  ENDFUNC
-
-//UINTN
-//ArmPlatformIsPrimaryCore (
-//  IN UINTN MpId
-//  );
-ArmPlatformIsPrimaryCore FUNCTION
-  mov32 r1, FixedPcdGet32(PcdArmPrimaryCoreMask)
-  and   r0, r0, r1
-  mov32 r1, FixedPcdGet32(PcdArmPrimaryCore)
-  ldr   r1, [r1]
-  cmp   r0, r1
-  moveq r0, #1
-  movne r0, #0
-  bx    lr
-  ENDFUNC
-
-//UINTN
-//ArmPlatformGetCorePosition (
-//  IN UINTN MpId
-//  );
-ArmPlatformGetCorePosition FUNCTION
-  and   r1, r0, #ARM_CORE_MASK
-  and   r0, r0, #ARM_CLUSTER_MASK
-  add   r0, r1, r0, LSR #7
-  bx    lr
-  ENDFUNC
-
-  END

+ 1 - 2
Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf

@@ -33,8 +33,7 @@
   RTSMMem.c
 
 [Sources.ARM]
-  Arm/RTSMHelper.asm    | RVCT
-  Arm/RTSMHelper.S      | GCC
+  Arm/RTSMHelper.S
 
 [Sources.AARCH64]
   AArch64/RTSMHelper.S

+ 1 - 2
Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf

@@ -30,8 +30,7 @@
   RTSM.c
 
 [Sources.ARM]
-  Arm/RTSMHelper.asm    | RVCT
-  Arm/RTSMHelper.S      | GCC
+  Arm/RTSMHelper.S
 
 [Sources.AARCH64]
   AArch64/RTSMHelper.S

+ 0 - 1
Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc

@@ -209,7 +209,6 @@
 [BuildOptions]
   XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7
   GCC:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a
-  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A8
 
   *_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES
 

+ 0 - 47
Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm

@@ -1,47 +0,0 @@
-//
-//  Copyright (c) 2012-2013, ARM Limited. All rights reserved.
-//
-//  SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-//
-
-#include <AsmMacroIoLib.h>
-#include <Base.h>
-
-#include <AutoGen.h>
-
-  INCLUDE AsmMacroIoLib.inc
-
-  EXPORT    ArmPlatformPeiBootAction
-  EXPORT    ArmPlatformIsPrimaryCore
-  EXPORT    ArmPlatformGetPrimaryCoreMpId
-
-  IMPORT    ArmReadMpidr
-
-  AREA BeagleBoardHelper, CODE, READONLY
-
-//UINTN
-//ArmPlatformIsPrimaryCore (
-//  IN UINTN MpId
-//  );
-ArmPlatformIsPrimaryCore FUNCTION
-  // BeagleBoard has a single core. We must always return 1.
-  mov   r0, #1
-  bx    lr
-  ENDFUNC
-
-ArmPlatformPeiBootAction FUNCTION
-  bx    lr
-  ENDFUNC
-
-//UINTN
-//ArmPlatformGetPrimaryCoreMpId (
-//  VOID
-//  );
-ArmPlatformGetPrimaryCoreMpId FUNCTION
-  // The BeagleBoard is a uniprocessor platform. The MPIDR of primary core is
-  // always the MPIDR of the calling CPU.
-  b     ArmReadMpidr
-  ENDFUNC
-
-  END

+ 1 - 4
Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf

@@ -29,14 +29,11 @@
   MemoryAllocationLib
 
 [Sources.common]
-  BeagleBoardHelper.asm  | RVCT
-  BeagleBoardHelper.S    | GCC
+  BeagleBoardHelper.S
   BeagleBoard.c
   BeagleBoardMem.c
   PadConfiguration.c
   Clock.c
-  BeagleBoardHelper.S    | GCC
-  BeagleBoardHelper.asm  | RVCT
 
 [FixedPcd]
   gArmTokenSpaceGuid.PcdFdBaseAddress

+ 1 - 2
Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf

@@ -21,8 +21,7 @@
 
 [Sources.ARM]
   Arm/ArchPrePi.c
-  Arm/ModuleEntryPoint.S   | GCC
-  Arm/ModuleEntryPoint.asm | RVCT
+  Arm/ModuleEntryPoint.S
 
 [Packages]
   ArmPkg/ArmPkg.dec

+ 0 - 1
Platform/LeMaker/CelloBoard/CelloBoard.dsc

@@ -242,7 +242,6 @@ DEFINE NUM_CORES    = 4
 ###################################################################################################
 
 [BuildOptions]
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
   GCC:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
 
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

+ 0 - 1
Silicon/Hisilicon/Hisilicon.dsc.inc

@@ -213,7 +213,6 @@
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
 
 [BuildOptions]
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
   GCC:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
 
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

+ 0 - 1
Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc

@@ -198,7 +198,6 @@
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
 
 [BuildOptions]
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
   GCC:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
 
 [BuildOptions.AARCH64.EDKII.DXE_RUNTIME_DRIVER]

+ 0 - 3
Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc

@@ -85,9 +85,6 @@
   GCC:*_*_ARM_ARCHCC_FLAGS     == -march=armv7-a -mthumb
   GCC:*_*_ARM_ARCHASM_FLAGS    == -march=armv7-a
 
-  RVCT:*_*_ARM_ARCHCC_FLAGS     == --cpu 7-A
-  RVCT:*_*_ARM_ARCHASM_FLAGS    == --cpu 7-A
-
   *_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES
 
 ################################################################################