From nobody Wed May 15 20:23:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+98013+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+98013+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1672934503; cv=none; d=zohomail.com; s=zohoarc; b=UEZuv6djzn/0rXdPQS4R634HXjym4lYRFqGEOKvrRkcPVf+HxlnQKjaGboAS4jAKV6zAu2lkeOLcVtDojZnyQLIFTDbbbgEHWIm3+r09qicBI6y46hm372TY5NhXdKk0Xx6W4vW9/4qFrRTiDwma3to8K787uUgQ7EVHsD5AALQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672934503; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=gaDbxxoQopP78XrvVb9ovk9zMqGhy8zofStBAxvPy5c=; b=IsYf9TTsEmTGBhJqVyHHUaGmpENvcwHAF6dAX7XZXiywbPkSHZZYWvdw7ZVspF619r8ttTWLnDIk7VsMNWD/tXzZrWNleCXwcWTUH3ga/h3bMzBV2IllKQLHm18wbQEZzbOR0ZQYAjHlO4svsiQWLqS+HOdCRBgBwglH12945oI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+98013+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1672934503367380.17775858052516; Thu, 5 Jan 2023 08:01:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id gRg6YY1788612xpPdyUK1EWa; Thu, 05 Jan 2023 08:01:42 -0800 X-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 X-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) X-Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EBD6C433F2; Thu, 5 Jan 2023 16:01:36 +0000 (UTC) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, rebecca@quicinc.com, Ard Biesheuvel Subject: [edk2-devel] [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> In-Reply-To: <20230105160130.1423542-1-ardb@kernel.org> References: <20230105160130.1423542-1-ardb@kernel.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ardb@kernel.org X-Gm-Message-State: atcRFjydZaLQ8OE5i3oba1PNx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672934502; bh=xtynf+KGq+OiSLWjXnTxwrvlNLbfjvGOaNknfrnsaw0=; h=Cc:Date:From:Reply-To:Subject:To; b=a+C79nTKdNz9KXIN5oMhzq/t2knaNNxCuDlxFzaHVmaVUvOhOt4qSe25jQPc0z8r0iM M0FSLT1+k9BUila8+NvKF4XmD4JPtQN05OrNYyKYQ0VcDvUHcDN6mUnSBQWZGbhWfy+cx 8PLausoTJyp9bRzezVgYNhaRy1upPhvpmn0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672934504776100006 Content-Type: text/plain; charset="utf-8" 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] =20 =20 [BuildOptions] - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG - GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG =20 ##########################################################################= ###### 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 =20 [BuildOptions] - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG =20 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] 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 =20 [BuildOptions] - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG =20 [BuildOptions.AARCH64.EDKII.DXE_RUNTIME_DRIVER] 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] ##########################################################################= ######################### =20 [BuildOptions] - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG =20 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] 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 !endif =20 - RVCT:*_*_ARM_PLATFORM_FLAGS =3D=3D --cpu Cortex-A15 -I$(WORKSPACE)/Platf= orm/ARM/VExpressPkg/Include/Platform/CTA15-A7 - GCC:*_*_ARM_PLATFORM_FLAGS =3D=3D -mcpu=3Dcortex-a15 -I$(WORKSPACE)/Plat= form/ARM/VExpressPkg/Include/Platform/CTA15-A7 =20 XCODE:*_*_ARM_PLATFORM_FLAGS =3D -I$(WORKSPACE)/Platform/ARM/VExpressPkg= /Include/Platform/CTA15-A7 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] XCODE:*_*_ARM_PLATFORM_FLAGS =3D=3D -arch armv7 GCC:*_*_ARM_PLATFORM_FLAGS =3D=3D -march=3Darmv7-a - RVCT:*_*_ARM_PLATFORM_FLAGS =3D=3D --cpu Cortex-A8 =20 *_*_*_CC_FLAGS =3D -DDISABLE_NEW_DEPRECATED_INTERFACES =20 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] ##########################################################################= ######################### =20 [BuildOptions] - RVCT:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG =20 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] 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 GCC:*_*_ARM_ARCHASM_FLAGS =3D=3D -march=3Darmv7-a =20 - RVCT:*_*_ARM_ARCHCC_FLAGS =3D=3D --cpu 7-A - RVCT:*_*_ARM_ARCHASM_FLAGS =3D=3D --cpu 7-A - *_*_*_CC_FLAGS =3D -DDISABLE_NEW_DEPRECATED_INTERFACES =20 ##########################################################################= ###### 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] CTA15-A7.c CTA15-A7Mem.c - CTA15-A7Helper.asm | RVCT - CTA15-A7Helper.S | GCC + CTA15-A7Helper.S =20 [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount 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 =20 [Sources.ARM] - Arm/RTSMHelper.asm | RVCT - Arm/RTSMHelper.S | GCC + Arm/RTSMHelper.S =20 [Sources.AARCH64] AArch64/RTSMHelper.S 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 =20 [Sources.ARM] - Arm/RTSMHelper.asm | RVCT - Arm/RTSMHelper.S | GCC + Arm/RTSMHelper.S =20 [Sources.AARCH64] AArch64/RTSMHelper.S 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 =20 [Sources.common] - BeagleBoardHelper.asm | RVCT - BeagleBoardHelper.S | GCC + BeagleBoardHelper.S BeagleBoard.c BeagleBoardMem.c PadConfiguration.c Clock.c - BeagleBoardHelper.S | GCC - BeagleBoardHelper.asm | RVCT =20 [FixedPcd] gArmTokenSpaceGuid.PcdFdBaseAddress 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] =20 [Sources.ARM] Arm/ArchPrePi.c - Arm/ModuleEntryPoint.S | GCC - Arm/ModuleEntryPoint.asm | RVCT + Arm/ModuleEntryPoint.S =20 [Packages] ArmPkg/ArmPkg.dec 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 @@ -// -// Copyright (c) 2012-2013, ARM Limited. All rights reserved. -// -// SPDX-License-Identifier: BSD-2-Clause-Patent -// -// - -#include - -#include - - 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 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 @@ -// -// Copyright (c) 2011-2013, ARM Limited. All rights reserved. -// -// SPDX-License-Identifier: BSD-2-Clause-Patent -// -// - -#include -#include -#include - -#include - -#include - - 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 =3D 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 a= t 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 =3D 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 C= PU 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 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 @@ -// -// Copyright (c) 2012-2013, ARM Limited. All rights reserved. -// -// SPDX-License-Identifier: BSD-2-Clause-Patent -// -// - -#include -#include - -#include - - 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 --=20 2.39.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#98013): https://edk2.groups.io/g/devel/message/98013 Mute This Topic: https://groups.io/mt/96074600/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Wed May 15 20:23:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+98014+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+98014+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1672934504; cv=none; d=zohomail.com; s=zohoarc; b=QHiQnERwSkKrR77fQsSP6v7QuSucb+N5ow8OMOMo6cMgc6T8VG12yrWb13VCQ+QYSA4A+9H67WQMoLMNw1D+eBYFTqMQNPx7nLhvgUB4M+B6yPLHrJq/owGaFKLNCdQqVQBsOM8f30jt7WIwoM9dx+BjOqGQ7l/F0gX1aIzRbwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672934504; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=WWvFwHvUEwJQxJ7dPfqkrSRCwBB5m8f+spTBV0FQk84=; b=O11qc3QyF4l8wNFgpGgWdO/gAmJAyWLjbgPOEY9XhEpCKMAhO+eozJz9HnwcTY5OYWqyBuJ9nnybCUWoHln8MqGfjF4G+oMXAp6E8hfPVmatVU9wUe47ZZOhNeRp1oiTWdApk+vG3v1TYAgKRaJVZBu5qBlujHUdXrtkUAqVpO4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+98014+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1672934504291881.6334227214919; Thu, 5 Jan 2023 08:01:44 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id DLmGYY1788612xYWlLtML838; Thu, 05 Jan 2023 08:01:43 -0800 X-Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by mx.groups.io with SMTP id smtpd.web11.16454.1672934501718596590 for ; Thu, 05 Jan 2023 08:01:42 -0800 X-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 4B11EB81B35; Thu, 5 Jan 2023 16:01:40 +0000 (UTC) X-Received: by smtp.kernel.org (Postfix) with ESMTPSA id D25DAC433D2; Thu, 5 Jan 2023 16:01:37 +0000 (UTC) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, rebecca@quicinc.com, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 2/2] Silicon/, Platform/: Get rid of redundant toolchains flags Date: Thu, 5 Jan 2023 17:01:30 +0100 Message-Id: <20230105160130.1423542-3-ardb@kernel.org> In-Reply-To: <20230105160130.1423542-1-ardb@kernel.org> References: <20230105160130.1423542-1-ardb@kernel.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ardb@kernel.org X-Gm-Message-State: 7poqgMnh7k8JmvOKUy85qcXCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672934503; bh=H1Xz8YJUQcuBf2Yf3krDojyAdZzhsMMUcQttRlenpr4=; h=Cc:Date:From:Reply-To:Subject:To; b=HNX9az8HwWRopKwpxJOmLm11xWbIvC//U0eIgiqK82O+tFuIMGKr46HVNzEo6LNrY0f NP8TYTQVnzpiLknXysyZrfNiGKkSCj0QwidDfg/YDtdVnEoqOJLmF4kpktkWjz0MHyD/+ RSbopTwRrOEruWvSIv1NY4lWYjVfoKn/5UI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672934504718100003 Content-Type: text/plain; charset="utf-8" The ARCHCC and ARCHASM flags are redundant, given that ARMv7-A with Thumb2 codegen has been the default for a long time, for all supported toolchains. So let's drop these definitions: this allows us to retire ARCHCC and ARCHASM entirely from EDK2. Signed-off-by: Ard Biesheuvel --- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 - Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 3 --- Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc | 7 ------- 3 files changed, 11 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 3be9822975e5..5b0a929b6b25 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -64,7 +64,6 @@ [LibraryClasses.ARM] =20 [BuildOptions] !ifdef ARM_BIGLITTLE_TC2 - *_*_ARM_ARCHCC_FLAGS =3D -DARM_BIGLITTLE_TC2=3D1 *_*_ARM_PP_FLAGS =3D -DARM_BIGLITTLE_TC2=3D1 !endif =20 diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platf= orm/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc index 0f5e356f0d5d..d44f4771c622 100644 --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -207,9 +207,6 @@ [LibraryClasses.ARM] NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [BuildOptions] - XCODE:*_*_ARM_PLATFORM_FLAGS =3D=3D -arch armv7 - GCC:*_*_ARM_PLATFORM_FLAGS =3D=3D -march=3Darmv7-a - *_*_*_CC_FLAGS =3D -DDISABLE_NEW_DEPRECATED_INTERFACES =20 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc b/Silicon= /TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc index 182a4198ad5c..92c2f6a2e607 100644 --- a/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc +++ b/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc @@ -78,13 +78,6 @@ [LibraryClasses.ARM] NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [BuildOptions] - XCODE:*_*_ARM_ARCHCC_FLAGS =3D=3D -arch armv7 -march=3Darmv7 - XCODE:*_*_ARM_ARCHASM_FLAGS =3D=3D -arch armv7 - XCODE:*_*_ARM_ARCHDLINK_FLAGS =3D=3D -arch armv7 - - GCC:*_*_ARM_ARCHCC_FLAGS =3D=3D -march=3Darmv7-a -mthumb - GCC:*_*_ARM_ARCHASM_FLAGS =3D=3D -march=3Darmv7-a - *_*_*_CC_FLAGS =3D -DDISABLE_NEW_DEPRECATED_INTERFACES =20 ##########################################################################= ###### --=20 2.39.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#98014): https://edk2.groups.io/g/devel/message/98014 Mute This Topic: https://groups.io/mt/96074601/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-