ArmPlatformPkg/Bds: Fixed Memory Corruption when updating the path of a Linux initrd

[mirror_edk2.git] / ArmPlatformPkg / ArmRealViewEbPkg / ArmRealViewEb-RTSM-A8.dsc

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index 41022b983e6304b8d6d585eba3e7c4b2ed978d0f..703c84c221112f124a09f15d48637618769742f5 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -31,6 +31,7 @@
 \r
 [LibraryClasses.common]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
+  ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf\r
   ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf\r
   \r
   # ARM PL390 General Interrupt Driver in Secure and Non-secure\r
@@ -39,12 +40,13 @@
 \r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
-  ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf\r
+  ArmPlatformSecLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbSecLibRTSM/ArmRealViewEbSecLib.inf\r
+  ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLibSec.inf\r
 \r
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A8 --fpu=softvfp -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
 \r
-  GCC:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
+  GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a8 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
 \r
   XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
 \r
@@ -56,7 +58,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!if $(EDK2_SKIP_PEICORE) == 1\r
+!ifdef $(EDK2_SKIP_PEICORE)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -101,11 +103,6 @@
   #\r
   gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
   \r
-  #\r
-  # ARM EB PCDS\r
-  #\r
-  gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0x1000a000\r
-  \r
   #\r
   # ARM PrimeCells\r
   #\r
@@ -134,7 +131,6 @@
   #\r
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x10041000\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x10040000\r
-  gArmTokenSpaceGuid.PcdGicNumInterrupts|96\r
 \r
   #\r
   # ARM L2x0 PCDs\r
@@ -157,12 +153,13 @@
   #\r
   # PEI Phase modules\r
   #\r
-!if $(EDK2_SKIP_PEICORE) == 1\r
+!ifdef $(EDK2_SKIP_PEICORE)\r
   ArmPlatformPkg/PrePi/PeiUniCore.inf {\r
     <LibraryClasses>\r
       ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
       ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf\r
+      ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf\r
   }\r
 !else\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf {\r