From bf72cf3381c20703042c5a574ec4ba689abd4430 Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Fri, 1 Jul 2011 14:21:12 +0000 Subject: ArmPlatformPkg: Move PcdStandalone from Feature PCD to Fixed PCD Feature PCDs cannot be used in assembly files. The PcdStandalone PCD is needed in one of the assembly file of the ArmPlatformPkg/PrePi module. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11952 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/Sec/Sec.c | 4 ++-- ArmPlatformPkg/Sec/Sec.inf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ArmPlatformPkg/Sec') diff --git a/ArmPlatformPkg/Sec/Sec.c b/ArmPlatformPkg/Sec/Sec.c index 98fe51256c..faa012ab40 100644 --- a/ArmPlatformPkg/Sec/Sec.c +++ b/ArmPlatformPkg/Sec/Sec.c @@ -119,7 +119,7 @@ CEntryPoint ( // If we skip the PEI Core we could want to initialize the DRAM in the SEC phase. // If we are in standalone, we need the initialization to copy the UEFI firmware into DRAM - if (FeaturePcdGet(PcdSkipPeiCore) || !FeaturePcdGet(PcdStandalone)) { + if (FeaturePcdGet(PcdSkipPeiCore) || !PcdGet32(PcdStandalone)) { // Initialize system memory (DRAM) ArmPlatformInitializeSystemMemory (); } @@ -204,7 +204,7 @@ CEntryPoint ( } // If ArmVe has not been built as Standalone then we need to patch the DRAM to add an infinite loop at the start address - if (FeaturePcdGet(PcdStandalone) == FALSE) { + if (!PcdGet32(PcdStandalone)) { if (CoreId == ARM_PRIMARY_CORE) { UINTN* StartAddress = (UINTN*)PcdGet32(PcdNormalFvBaseAddress); diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf index d36fc0c777..ad66902f93 100644 --- a/ArmPlatformPkg/Sec/Sec.inf +++ b/ArmPlatformPkg/Sec/Sec.inf @@ -45,10 +45,10 @@ SerialPortLib [FeaturePcd] - gArmPlatformTokenSpaceGuid.PcdStandalone gArmTokenSpaceGuid.PcdSkipPeiCore [FixedPcd] + gArmPlatformTokenSpaceGuid.PcdStandalone gArmTokenSpaceGuid.PcdVFPEnabled gArmPlatformTokenSpaceGuid.PcdMPCoreSupport -- cgit v1.2.3