From da275244e3b21ece58610458a7cefa5bf70a1466 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Wed, 17 Jul 2013 06:26:10 +0000 Subject: [PATCH] ArmPkg: Removed the non-used PCD PcdGicPrimaryCoreId Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14480 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPkg/ArmPkg.dec | 4 ---- ArmPkg/Drivers/PL390Gic/PL390GicDxe.c | 7 ------- ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf | 1 - ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 - ArmPlatformPkg/PrePeiCore/MainMPCore.c | 7 ------- ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 1 - ArmPlatformPkg/PrePi/MainMPCore.c | 7 ------- ArmPlatformPkg/PrePi/PeiMPCore.inf | 1 - 8 files changed, 29 deletions(-) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index e664f8626a..145c6b08f9 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -147,10 +147,6 @@ gArmTokenSpaceGuid.PcdArmPrimaryCoreMask|0xF03|UINT32|0x00000031 # The Primary Core is ClusterId[0] & CoreId[0] gArmTokenSpaceGuid.PcdArmPrimaryCore|0|UINT32|0x00000037 - # Number of the CPU Interface for the Primary Core (eg: The number for the CPU0 of - # Cluster1 might be 4 if the implementer had followed the convention: Cpu Interface - # = 4 * Cluster) - gArmTokenSpaceGuid.PcdGicPrimaryCoreId|0|UINT32|0x00000043 # # ARM L2x0 PCDs diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c index 310053afe0..ce96831a42 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c +++ b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c @@ -346,13 +346,6 @@ InterruptDxeInitialize ( EFI_CPU_ARCH_PROTOCOL *Cpu; UINT32 CpuTarget; - // Check PcdGicPrimaryCoreId has been set in case the Primary Core is not the core 0 of Cluster 0 - DEBUG_CODE_BEGIN(); - if ((PcdGet32(PcdArmPrimaryCore) != 0) && (PcdGet32 (PcdGicPrimaryCoreId) == 0)) { - DEBUG((EFI_D_WARN,"Warning: the PCD PcdGicPrimaryCoreId does not seem to be set up for the configuration.\n")); - } - DEBUG_CODE_END(); - // Make sure the Interrupt Controller Protocol is not already installed in the system. ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gHardwareInterruptProtocolGuid); diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf index 422fd414b7..cf0b8f3fe6 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf +++ b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf @@ -51,7 +51,6 @@ gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase gArmTokenSpaceGuid.PcdArmPrimaryCore - gArmTokenSpaceGuid.PcdGicPrimaryCoreId [Depex] gEfiCpuArchProtocolGuid diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc index 956e92074b..0cc4434165 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -122,7 +122,6 @@ # A7_1 = 0x101, GicCoreId = 3 # A7_2 = 0x102, GicCoreId = 4 gArmTokenSpaceGuid.PcdArmPrimaryCore|0x100 - gArmTokenSpaceGuid.PcdGicPrimaryCoreId|2 !endif # diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c index 29c96a2296..9bfc990628 100644 --- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c @@ -110,13 +110,6 @@ PrimaryMain ( UINTN TemporaryRamBase; UINTN TemporaryRamSize; - // Check PcdGicPrimaryCoreId has been set in case the Primary Core is not the core 0 of Cluster 0 - DEBUG_CODE_BEGIN(); - if ((PcdGet32(PcdArmPrimaryCore) != 0) && (PcdGet32 (PcdGicPrimaryCoreId) == 0)) { - DEBUG((EFI_D_WARN,"Warning: the PCD PcdGicPrimaryCoreId does not seem to be set up for the configuration.\n")); - } - DEBUG_CODE_END(); - CreatePpiList (&PpiListSize, &PpiList); // Enable the GIC Distributor diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf index 4658486336..351ac67807 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf @@ -63,7 +63,6 @@ gArmTokenSpaceGuid.PcdFvSize gArmTokenSpaceGuid.PcdArmPrimaryCore - gArmTokenSpaceGuid.PcdGicPrimaryCoreId gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize diff --git a/ArmPlatformPkg/PrePi/MainMPCore.c b/ArmPlatformPkg/PrePi/MainMPCore.c index e8cd75186f..5868993d57 100644 --- a/ArmPlatformPkg/PrePi/MainMPCore.c +++ b/ArmPlatformPkg/PrePi/MainMPCore.c @@ -26,13 +26,6 @@ PrimaryMain ( IN UINT64 StartTimeStamp ) { - // Check PcdGicPrimaryCoreId has been set in case the Primary Core is not the core 0 of Cluster 0 - DEBUG_CODE_BEGIN(); - if ((PcdGet32(PcdArmPrimaryCore) != 0) && (PcdGet32 (PcdGicPrimaryCoreId) == 0)) { - DEBUG((EFI_D_WARN,"Warning: the PCD PcdGicPrimaryCoreId does not seem to be set up for the configuration.\n")); - } - DEBUG_CODE_END(); - // Enable the GIC Distributor ArmGicEnableDistributor(PcdGet32(PcdGicDistributorBase)); diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf index 359e7717ef..a2814b6710 100755 --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf @@ -96,7 +96,6 @@ gArmPlatformTokenSpaceGuid.PcdCoreCount gArmPlatformTokenSpaceGuid.PcdClusterCount gArmTokenSpaceGuid.PcdArmPrimaryCore - gArmTokenSpaceGuid.PcdGicPrimaryCoreId gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize -- 2.39.2