#\r
-# Copyright (c) 2011, 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
-# which accompanies this distribution. The full text of the license may be found at \r
-# http://opensource.org/licenses/bsd-license.php \r
+# Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+# This program and the accompanying materials\r
+# are licensed and made available under the terms and conditions of the BSD License\r
+# which accompanies this distribution. The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
#\r
#\r
\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
+ RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
\r
GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
\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
[PcdsFixedAtBuild.common]\r
gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM RealView Emulation Board"\r
gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ArmRealViewEb-A9x2"\r
- \r
+\r
+ gArmPlatformTokenSpaceGuid.PcdCoreCount|2\r
+\r
#\r
# NV Storage PCDs. Use base of 0x43F00000 for NOR0\r
#\r
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x43F00000\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x000C0000\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x43FC0000\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00020000\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x43F20000\r
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x00020000\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x43FE0000\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x43F40000\r
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00020000\r
\r
# Stacks for MPCores in Secure World\r
# Stacks for MPCores in Normal World\r
gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x48000000\r
\r
- # System Memory (256MB) \r
+ # System Memory (256MB)\r
gArmTokenSpaceGuid.PcdSystemMemoryBase|0x70000000\r
gArmTokenSpaceGuid.PcdSystemMemorySize|0x10000000\r
- \r
+\r
# Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
- \r
+\r
#\r
# ARM Pcds\r
#\r
gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
- \r
- #\r
- # ARM EB PCDS\r
- #\r
- gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0x1000a000\r
- \r
+\r
#\r
# ARM PrimeCells\r
#\r
- \r
+\r
## SP804 Timer\r
gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000\r
gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000 # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms\r
gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicInterruptNum|33\r
- gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0x10011000 \r
+ gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0x10011000\r
gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase|0x10011020\r
gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase|0x10012020\r
- \r
+\r
## PL031 RealTimeClock\r
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x10017000\r
- \r
+\r
## PL111 Lcd\r
gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x10020000\r
- \r
+\r
#\r
# ARM PL011 - Serial Terminal\r
#\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x10009000\r
- \r
+\r
#\r
- # ARM PL390 General Interrupt Controller\r
+ # ARM General Interrupt Controller\r
#\r
gArmTokenSpaceGuid.PcdGicDistributorBase|0x1F001000\r
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x1F000100\r
- gArmTokenSpaceGuid.PcdGicNumInterrupts|96\r
\r
#\r
# ARM L2x0 PCDs\r
#\r
gArmTokenSpaceGuid.PcdL2x0ControllerBase|0x1F002000\r
- \r
+\r
################################################################################\r
#\r
# Components Section - list of all EDK II Modules needed by this Platform\r
#\r
################################################################################\r
[Components.common]\r
- \r
+\r
#\r
# SEC\r
#\r
- ArmPlatformPkg/Sec/Sec.inf\r
- \r
+ ArmPlatformPkg/Sec/Sec.inf {\r
+ <LibraryClasses>\r
+ # Use the implementation which set the Secure bits\r
+ ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.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
# Architectural Protocols\r
#\r
- ArmPkg/Drivers/CpuDxe/CpuDxe.inf \r
+ ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
- EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf \r
- \r
+ EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf\r
+\r
EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
EmbeddedPkg/SerialDxe/SerialDxe.inf\r
\r
- ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
+ ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf\r
- \r
+\r
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
\r
#\r
# Semi-hosting filesystem\r
#\r
ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
- \r
+\r
#\r
# FAT filesystem + GPT/MBR partitioning\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