#\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
!include ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc\r
\r
[LibraryClasses.common]\r
- ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf\r
+ ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf\r
ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf\r
\r
- # ARM PL390 General Interrupt Driver in Secure and Non-secure\r
- ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf\r
- ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
-\r
[LibraryClasses.common.SEC]\r
- ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLibSec.inf\r
- ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf\r
+ ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.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-A9 --fpu=softvfp -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
################################################################################\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
#\r
gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
\r
- #\r
- # ARM EB PCDS\r
- #\r
- gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0x1000a000\r
- \r
#\r
# ARM PrimeCells\r
#\r
#\r
gArmTokenSpaceGuid.PcdGicDistributorBase|0x1F001000\r
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x1F000100\r
- gArmTokenSpaceGuid.PcdGicNumInterrupts|96\r
\r
#\r
# ARM L2x0 PCDs\r
#\r
# SEC\r
#\r
- ArmPlatformPkg/Sec/Sec.inf\r
+ ArmPlatformPkg/Sec/Sec.inf {\r
+ <LibraryClasses>\r
+ # Use the implementation which set the Secure bits\r
+ ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf\r
+ }\r
\r
#\r
# PEI Phase modules\r
#\r
-!if $(EDK2_SKIP_PEICORE) == 1\r
+!ifdef $(EDK2_SKIP_PEICORE)\r
ArmPlatformPkg/PrePi/PeiMPCore.inf {\r
<LibraryClasses>\r
- ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
- ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.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/PrePeiCoreMPCore.inf {\r
- <LibraryClasses>\r
- ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
- }\r
+ ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf\r
MdeModulePkg/Core/Pei/PeiMain.inf\r
MdeModulePkg/Universal/PCD/Pei/Pcd.inf {\r
<LibraryClasses>\r
#\r
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
- FatPkg/EnhancedFatDxe/Fat.inf\r
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
\r
- #\r
- # Application\r
- # \r
- EmbeddedPkg/Ebl/Ebl.inf\r
-\r
#\r
# Bds\r
#\r