From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by mx.groups.io with SMTP id smtpd.web11.16453.1672934501611267495 for ; Thu, 05 Jan 2023 08:01:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lqLi9VLZ; spf=pass (domain: kernel.org, ip: 145.40.68.75, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A9EDAB81B36; Thu, 5 Jan 2023 16:01:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EBD6C433F2; Thu, 5 Jan 2023 16:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672934497; bh=lzE49Aucd91Q3scRhJ+q1yrQq5s3ik8XmxtHjKsh3hM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lqLi9VLZ7GsC8mr4EtV9tj1p7Ezgs7Vy66HTqq8AqYr7efL9iAp2z5pwPDCq8enb8 mg4wVn97lSQu3zy0H5kV0fRY1y7xyoq5pLm2OuwziS6S7VQw6LycjPhuw9POaxU161 MmhEbAuuIUReYnrATQp7pkQQ5DFLeXDONSka6zgKWu9XSB+X/FPAbJuPFi6zuffOcu daNAX1MKGiTWQx0z7HPdpmeMHUtHimC940q6IJe8JDWni+vv5kPkHTGtJAlcxEdEe6 tgjXnZcZwoLEhyagruQ8HPIrNlydnB3+bX/RSk2M0VjsHTxtt09dMK/JKOJsM1ynQ5 TGn+esd5ALnpg== From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, rebecca@quicinc.com, Ard Biesheuvel Subject: [PATCH edk2-platforms 1/2] Platform/ Silicon/: Drop remnants of RVCT toolchain support Date: Thu, 5 Jan 2023 17:01:29 +0100 Message-Id: <20230105160130.1423542-2-ardb@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230105160130.1423542-1-ardb@kernel.org> References: <20230105160130.1423542-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 --- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc = | 2 - Silicon/Hisilicon/Hisilicon.dsc.inc = | 1 - Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc = | 1 - Platform/AMD/OverdriveBoard/OverdriveBoard.dsc = | 1 - Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc = | 2 - Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc = | 1 - Platform/LeMaker/CelloBoard/CelloBoard.dsc = | 1 - Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc = | 3 - Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf= | 3 +- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf = | 3 +- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf = | 3 +- Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.= inf | 5 +- Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf = | 3 +- Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm= | 90 ---------------- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm = | 112 -------------------- Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelp= er.asm | 47 -------- 16 files changed, 5 insertions(+), 273 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VE= xpressPkg/ArmVExpress.dsc.inc index 17e4a3fd13d7..81d35fb805c6 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -268,8 +268,6 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] =0D =0D [BuildOptions]=0D - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D -=0D GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D =0D ##########################################################################= ######=0D diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisili= con.dsc.inc index 6bacd9cafd7a..b12efd7f031b 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -213,7 +213,6 @@ [LibraryClasses.AARCH64] ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/Ar= mGenericTimerPhyCounterLib.inf=0D =0D [BuildOptions]=0D - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D =0D [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]=0D diff --git a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc b/Si= licon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc index 3c4440dac5f0..7166212875ec 100644 --- a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc +++ b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc @@ -198,7 +198,6 @@ [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.comm= on.UEFI_APPLICATION, Libr PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D =0D [BuildOptions]=0D - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D =0D [BuildOptions.AARCH64.EDKII.DXE_RUNTIME_DRIVER]=0D diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/= OverdriveBoard/OverdriveBoard.dsc index 236e8f1db3dd..27ae2a86b82d 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -250,7 +250,6 @@ [LibraryClasses.AARCH64] ##########################################################################= #########################=0D =0D [BuildOptions]=0D - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D =0D [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]=0D diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 9c5e78d6275d..3be9822975e5 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -68,8 +68,6 @@ [BuildOptions] *_*_ARM_PP_FLAGS =3D -DARM_BIGLITTLE_TC2=3D1=0D !endif=0D =0D - RVCT:*_*_ARM_PLATFORM_FLAGS =3D=3D --cpu Cortex-A15 -I$(WORKSPACE)/Platf= orm/ARM/VExpressPkg/Include/Platform/CTA15-A7=0D -=0D GCC:*_*_ARM_PLATFORM_FLAGS =3D=3D -mcpu=3Dcortex-a15 -I$(WORKSPACE)/Plat= form/ARM/VExpressPkg/Include/Platform/CTA15-A7=0D =0D XCODE:*_*_ARM_PLATFORM_FLAGS =3D -I$(WORKSPACE)/Platform/ARM/VExpressPkg= /Include/Platform/CTA15-A7=0D diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platf= orm/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc index 2de49fc0932c..0f5e356f0d5d 100644 --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -209,7 +209,6 @@ [LibraryClasses.ARM] [BuildOptions]=0D XCODE:*_*_ARM_PLATFORM_FLAGS =3D=3D -arch armv7=0D GCC:*_*_ARM_PLATFORM_FLAGS =3D=3D -march=3Darmv7-a=0D - RVCT:*_*_ARM_PLATFORM_FLAGS =3D=3D --cpu Cortex-A8=0D =0D *_*_*_CC_FLAGS =3D -DDISABLE_NEW_DEPRECATED_INTERFACES=0D =0D diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/= CelloBoard/CelloBoard.dsc index 0b98d976f9c4..b46295a1648a 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -242,7 +242,6 @@ [LibraryClasses.AARCH64] ##########################################################################= #########################=0D =0D [BuildOptions]=0D - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG=0D =0D [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]=0D diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc b/Silicon= /TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc index 8bf56c376851..182a4198ad5c 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc +++ b/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc @@ -85,9 +85,6 @@ [BuildOptions] GCC:*_*_ARM_ARCHCC_FLAGS =3D=3D -march=3Darmv7-a -mthumb=0D GCC:*_*_ARM_ARCHASM_FLAGS =3D=3D -march=3Darmv7-a=0D =0D - RVCT:*_*_ARM_ARCHCC_FLAGS =3D=3D --cpu 7-A=0D - RVCT:*_*_ARM_ARCHASM_FLAGS =3D=3D --cpu 7-A=0D -=0D *_*_*_CC_FLAGS =3D -DDISABLE_NEW_DEPRECATED_INTERFACES=0D =0D ##########################################################################= ######=0D diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVEx= pressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmV= ExpressLib.inf index e585fe6c1876..dbe4cb88fd21 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLi= b.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLi= b.inf @@ -31,8 +31,7 @@ [LibraryClasses] [Sources.common]=0D CTA15-A7.c=0D CTA15-A7Mem.c=0D - CTA15-A7Helper.asm | RVCT=0D - CTA15-A7Helper.S | GCC=0D + CTA15-A7Helper.S=0D =0D [FixedPcd]=0D gArmPlatformTokenSpaceGuid.PcdCoreCount=0D diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpres= sLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressL= ib.inf index 4b582fdfc945..94572861b398 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf @@ -33,8 +33,7 @@ [Sources.common] RTSMMem.c=0D =0D [Sources.ARM]=0D - Arm/RTSMHelper.asm | RVCT=0D - Arm/RTSMHelper.S | GCC=0D + Arm/RTSMHelper.S=0D =0D [Sources.AARCH64]=0D AArch64/RTSMHelper.S=0D diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpres= sLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpre= ssLibSec.inf index 26f551508793..479b0e1b84f5 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec= .inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec= .inf @@ -30,8 +30,7 @@ [Sources.common] RTSM.c=0D =0D [Sources.ARM]=0D - Arm/RTSMHelper.asm | RVCT=0D - Arm/RTSMHelper.S | GCC=0D + Arm/RTSMHelper.S=0D =0D [Sources.AARCH64]=0D AArch64/RTSMHelper.S=0D diff --git a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/Bea= gleBoardLib.inf b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLi= b/BeagleBoardLib.inf index 6584323ccc86..3f06a9b5b2bd 100644 --- a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoar= dLib.inf +++ b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoar= dLib.inf @@ -29,14 +29,11 @@ [LibraryClasses] MemoryAllocationLib=0D =0D [Sources.common]=0D - BeagleBoardHelper.asm | RVCT=0D - BeagleBoardHelper.S | GCC=0D + BeagleBoardHelper.S=0D BeagleBoard.c=0D BeagleBoardMem.c=0D PadConfiguration.c=0D Clock.c=0D - BeagleBoardHelper.S | GCC=0D - BeagleBoardHelper.asm | RVCT=0D =0D [FixedPcd]=0D gArmTokenSpaceGuid.PcdFdBaseAddress=0D diff --git a/Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf b/Pla= tform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf index a4bf25b59582..414091957cb2 100644 --- a/Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf +++ b/Platform/BeagleBoard/BeagleBoardPkg/PrePi/PeiUniCore.inf @@ -21,8 +21,7 @@ [Sources] =0D [Sources.ARM]=0D Arm/ArchPrePi.c=0D - Arm/ModuleEntryPoint.S | GCC=0D - Arm/ModuleEntryPoint.asm | RVCT=0D + Arm/ModuleEntryPoint.S=0D =0D [Packages]=0D ArmPkg/ArmPkg.dec=0D diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-= A7Helper.asm b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA1= 5-A7Helper.asm deleted file mode 100644 index 9fb06ea00968..000000000000 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helpe= r.asm +++ /dev/null @@ -1,90 +0,0 @@ -//=0D -// Copyright (c) 2012-2013, ARM Limited. All rights reserved.=0D -//=0D -// SPDX-License-Identifier: BSD-2-Clause-Patent=0D -//=0D -//=0D -=0D -#include =0D -=0D -#include =0D -=0D - INCLUDE AsmMacroIoLib.inc=0D -=0D - EXPORT ArmPlatformPeiBootAction=0D - EXPORT ArmPlatformGetCorePosition=0D - EXPORT ArmPlatformIsPrimaryCore=0D - EXPORT ArmPlatformGetPrimaryCoreMpId=0D -=0D - PRESERVE8=0D - AREA CTA15A7Helper, CODE, READONLY=0D -=0D -ArmPlatformPeiBootAction FUNCTION=0D - bx lr=0D - ENDFUNC=0D -=0D -//UINTN=0D -//ArmPlatformGetCorePosition (=0D -// IN UINTN MpId=0D -// );=0D -ArmPlatformGetCorePosition FUNCTION=0D - and r1, r0, #ARM_CORE_MASK=0D - and r0, r0, #ARM_CLUSTER_MASK=0D - add r0, r1, r0, LSR #7=0D - bx lr=0D - ENDFUNC=0D -=0D -//UINTN=0D -//ArmPlatformIsPrimaryCore (=0D -// IN UINTN MpId=0D -// );=0D -ArmPlatformIsPrimaryCore FUNCTION=0D - // Extract cpu_id and cluster_id from ARM_SCC_CFGREG48=0D - // with cpu_id[0:3] and cluster_id[4:7]=0D - mov32 r1, ARM_CTA15A7_SCC_CFGREG48=0D - ldr r1, [r1]=0D - lsr r1, #24=0D -=0D - // Shift the SCC value to get the cluster ID at the offset #8=0D - lsl r2, r1, #4=0D - and r2, r2, #0xF00=0D -=0D - // Keep only the cpu ID from the original SCC=0D - and r1, r1, #0x0F=0D - // Add the Cluster ID to the Cpu ID=0D - orr r1, r1, r2=0D -=0D - // Keep the Cluster ID and Core ID from the MPID=0D - mov32 r2, ARM_CLUSTER_MASK :OR: ARM_CORE_MASK=0D - and r0, r0, r2=0D -=0D - // Compare mpid and boot cpu from ARM_SCC_CFGREG48=0D - cmp r0, r1=0D - moveq r0, #1=0D - movne r0, #0=0D - bx lr=0D - ENDFUNC=0D -=0D -//UINTN=0D -//ArmPlatformGetPrimaryCoreMpId (=0D -// VOID=0D -// );=0D -ArmPlatformGetPrimaryCoreMpId FUNCTION=0D - // Extract cpu_id and cluster_id from ARM_SCC_CFGREG48=0D - // with cpu_id[0:3] and cluster_id[4:7]=0D - mov32 r0, ARM_CTA15A7_SCC_CFGREG48=0D - ldr r0, [r0]=0D - lsr r0, #24=0D -=0D - // Shift the SCC value to get the cluster ID at the offset #8=0D - lsl r1, r0, #4=0D - and r1, r1, #0xF00=0D -=0D - // Keep only the cpu ID from the original SCC=0D - and r0, r0, #0x0F=0D - // Add the Cluster ID to the Cpu ID=0D - orr r0, r0, r1=0D - bx lr=0D - ENDFUNC=0D -=0D - END=0D diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHe= lper.asm b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelp= er.asm deleted file mode 100644 index 5ae6f9eab8a8..000000000000 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm +++ /dev/null @@ -1,112 +0,0 @@ -//=0D -// Copyright (c) 2011-2013, ARM Limited. All rights reserved.=0D -//=0D -// SPDX-License-Identifier: BSD-2-Clause-Patent=0D -//=0D -//=0D -=0D -#include =0D -#include =0D -#include =0D -=0D -#include =0D -=0D -#include =0D -=0D - INCLUDE AsmMacroIoLib.inc=0D -=0D - EXPORT ArmPlatformPeiBootAction=0D - EXPORT ArmGetCpuCountPerCluster=0D - EXPORT ArmPlatformIsPrimaryCore=0D - EXPORT ArmPlatformGetPrimaryCoreMpId=0D - EXPORT ArmPlatformGetCorePosition=0D -=0D - AREA RTSMHelper, CODE, READONLY=0D -=0D -ArmPlatformPeiBootAction FUNCTION=0D - bx lr=0D - ENDFUNC=0D -=0D -// IN None=0D -// OUT r0 =3D SCU Base Address=0D -ArmGetScuBaseAddress FUNCTION=0D - // Read Configuration Base Address Register. ArmCBar cannot be called to= get=0D - // the Configuration BAR as a stack is not necessary setup. The SCU is a= t the=0D - // offset 0x0000 from the Private Memory Region.=0D - mrc p15, 4, r0, c15, c0, 0=0D - bx lr=0D - ENDFUNC=0D -=0D -//UINTN=0D -//ArmPlatformGetPrimaryCoreMpId (=0D -// VOID=0D -// );=0D -ArmPlatformGetPrimaryCoreMpId FUNCTION=0D - mov32 r0, FixedPcdGet32(PcdArmPrimaryCore)=0D - bx lr=0D - ENDFUNC=0D -=0D -// IN None=0D -// OUT r0 =3D number of cores present in the system=0D -ArmGetCpuCountPerCluster FUNCTION=0D - stmfd SP!, {r1-r2}=0D -=0D - // Read CP15 MIDR=0D - mrc p15, 0, r1, c0, c0, 0=0D -=0D - // Check if the CPU is A15=0D - mov r1, r1, LSR #4=0D - mov r0, #ARM_CPU_TYPE_MASK=0D - and r1, r1, r0=0D -=0D - mov r0, #ARM_CPU_TYPE_A15=0D - cmp r1, r0=0D - beq _Read_cp15_reg=0D -=0D -_CPU_is_not_A15=0D - mov r2, lr ; Save link register=0D - bl ArmGetScuBaseAddress ; Read SCU Base Address=0D - mov lr, r2 ; Restore link register val=0D - ldr r0, [r0, #A9_SCU_CONFIG_OFFSET] ; Read SCU Config reg to get C= PU count=0D - b _Return=0D -=0D -_Read_cp15_reg=0D - mrc p15, 1, r0, c9, c0, 2 ; Read C9 register of CP15 to get= CPU count=0D - lsr r0, #24=0D -=0D -=0D -_Return=0D - and r0, r0, #3=0D - // Add '1' to the number of CPU on the Cluster=0D - add r0, r0, #1=0D - ldmfd SP!, {r1-r2}=0D - bx lr=0D - ENDFUNC=0D -=0D -//UINTN=0D -//ArmPlatformIsPrimaryCore (=0D -// IN UINTN MpId=0D -// );=0D -ArmPlatformIsPrimaryCore FUNCTION=0D - mov32 r1, FixedPcdGet32(PcdArmPrimaryCoreMask)=0D - and r0, r0, r1=0D - mov32 r1, FixedPcdGet32(PcdArmPrimaryCore)=0D - ldr r1, [r1]=0D - cmp r0, r1=0D - moveq r0, #1=0D - movne r0, #0=0D - bx lr=0D - ENDFUNC=0D -=0D -//UINTN=0D -//ArmPlatformGetCorePosition (=0D -// IN UINTN MpId=0D -// );=0D -ArmPlatformGetCorePosition FUNCTION=0D - and r1, r0, #ARM_CORE_MASK=0D - and r0, r0, #ARM_CLUSTER_MASK=0D - add r0, r1, r0, LSR #7=0D - bx lr=0D - ENDFUNC=0D -=0D - END=0D diff --git a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/Bea= gleBoardHelper.asm b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoar= dLib/BeagleBoardHelper.asm deleted file mode 100644 index 884f567cef53..000000000000 --- a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoar= dHelper.asm +++ /dev/null @@ -1,47 +0,0 @@ -//=0D -// Copyright (c) 2012-2013, ARM Limited. All rights reserved.=0D -//=0D -// SPDX-License-Identifier: BSD-2-Clause-Patent=0D -//=0D -//=0D -=0D -#include =0D -#include =0D -=0D -#include =0D -=0D - INCLUDE AsmMacroIoLib.inc=0D -=0D - EXPORT ArmPlatformPeiBootAction=0D - EXPORT ArmPlatformIsPrimaryCore=0D - EXPORT ArmPlatformGetPrimaryCoreMpId=0D -=0D - IMPORT ArmReadMpidr=0D -=0D - AREA BeagleBoardHelper, CODE, READONLY=0D -=0D -//UINTN=0D -//ArmPlatformIsPrimaryCore (=0D -// IN UINTN MpId=0D -// );=0D -ArmPlatformIsPrimaryCore FUNCTION=0D - // BeagleBoard has a single core. We must always return 1.=0D - mov r0, #1=0D - bx lr=0D - ENDFUNC=0D -=0D -ArmPlatformPeiBootAction FUNCTION=0D - bx lr=0D - ENDFUNC=0D -=0D -//UINTN=0D -//ArmPlatformGetPrimaryCoreMpId (=0D -// VOID=0D -// );=0D -ArmPlatformGetPrimaryCoreMpId FUNCTION=0D - // The BeagleBoard is a uniprocessor platform. The MPIDR of primary core= is=0D - // always the MPIDR of the calling CPU.=0D - b ArmReadMpidr=0D - ENDFUNC=0D -=0D - END=0D --=20 2.39.0