ArmPlatformPkg/ArmRealViewEbPkg: Introduce 'ArmRealViewEb.dsc.inc' to avoid duplication of library and PCD defintions around ARM RealView Emulation Boards

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12427 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 19 insertions, 296 deletions

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 7d65f65388..2169ed8c7f 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -27,218 +27,26 @@
   SKUID_IDENTIFIER               = DEFAULT

   FLASH_DEFINITION               = ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf

 

-[LibraryClasses.common]

-!if $(TARGET) == RELEASE

-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

-!else

-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

-#  UncachedMemoryAllocationLib|ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf

-!endif

-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

+!include ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc

 

+[LibraryClasses.common]

   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf

   ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf

   

-  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

-  BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf

-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf

-

-  EfiResetSystemLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ResetSystemLib/ResetSystemLib.inf

-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-  

-  EblCmdLib|ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf

-  EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf

-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

-  

-  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

-  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

-

-  #

-  # Uncomment (and comment out the next line) For RealView Debugger. The Standard IO window 

-  # in the debugger will show load and unload commands for symbols. You can cut and paste this

-  # into the command window to load symbols. We should be able to use a script to do this, but

-  # the version of RVD I have does not support scripts accessing system memory.

-  #

-#  PeCoffExtraActionLib|ArmPkg/Library/RvdPeCoffExtraActionLib/RvdPeCoffExtraActionLib.inf

-  PeCoffExtraActionLib|ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf

-#  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

-  

-  CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf

-  DefaultExceptioHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf

-  

-  SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf

-  

-  RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf

-

-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

-  

-  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf

-  

-  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf

-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

-

-  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

-

-#

-# Assume everything is fixed at build

-#

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-

-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-

-  EblAddExternalCommandLib|EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf

-

-  CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

-

-  EblNetworkLib|EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf

-  

-  ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

-  DebugAgentLib|ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf

-  DebugAgentTimerLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf

-

-  SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf

-  TimerLib|ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.inf  

-  GdbSerialLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/GdbSerialLib/GdbSerialLib.inf

-  DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

-  

-  # ARM PL011 UART Driver

-  PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf

   # ARM PL390 General Interrupt Driver in Secure and Non-secure

   ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

   ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

 

-  BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf

-  

-  ArmPlatformSysConfigLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf

-  NorFlashPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEbLib.inf

-  LcdPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/PL111LcdArmRealViewEbLib/PL111LcdArmRealViewEbLib.inf

-

 [LibraryClasses.common.SEC]

   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLibSec.inf

   ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf

-  DebugSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf

-  

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  

-  # 1/123 faster than Stm or Vstm version

-  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-

-  # Uncomment to turn on GDB stub in SEC. 

-  #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.inf

-  

-  # L2 Cache Driver

-  L2X0CacheLib|ArmPlatformPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf

-

-!if $(EDK2_SKIP_PEICORE) == 1

-  PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf

-  ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

-  LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

-  MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf

-  HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf

-  PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf

-  PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf

-  MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf

-!endif

-

-[LibraryClasses.common.PEI_CORE]

-  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

-  # note: this won't actually work since globals in PEI are not writeable

-  # need to generate an ARM PEI services table pointer implementation

-  PeiServicesTablePointerLib|ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf

-  PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf

-  PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf

-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf

-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

-  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf

-

-[LibraryClasses.common.PEIM]

-  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

-  # note: this won't actually work since globals in PEI are not writeable

-  # need to generate an ARM PEI services table pointer implementation

-  PeiServicesTablePointerLib|ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf

-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

-  PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf

-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf

-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

-  PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf

-  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf

-

-[LibraryClasses.common.DXE_CORE]

-  HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

-  MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf

-  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

-  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

-  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

-  PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf

-

-[LibraryClasses.common.DXE_DRIVER]

-  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

-  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

-  PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

-

-[LibraryClasses.common.UEFI_APPLICATION]

-  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

-  UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf

-  PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

-

-[LibraryClasses.common.UEFI_DRIVER]

-  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

-  UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

-  PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

-

-[LibraryClasses.common.DXE_RUNTIME_DRIVER]

-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

-  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

-

-[LibraryClasses.ARM]

-  #

-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.

-  # This library provides the instrinsic functions generate by a given compiler.

-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.

-  #

-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf

 

 [BuildOptions]

-  RVCT:*_*_ARM_ARCHCC_FLAGS  == --cpu Cortex-A9 --thumb --fpu=softvfp -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

-  RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu Cortex-A9 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

+  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 --fpu=softvfp -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

 

-  GCC:*_*_ARM_ARCHCC_FLAGS    == -march=armv7-a -mthumb -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform 

-  GCC:*_*_ARM_ARCHASM_FLAGS   == -march=armv7-a -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

-  GCC:RELEASE_*_*_CC_FLAGS    = -DMDEPKG_NDEBUG -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

+  GCC:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

 

-  XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv7 -march=armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

-  XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

-  XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

+  XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform

 

 

 ################################################################################

@@ -248,20 +56,6 @@
 ################################################################################

 

 [PcdsFeatureFlag.common]

-  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE

-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE

-  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE

-  

-  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

-  

-  # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress

-  gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE

-  

-  gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport|FALSE

-

-  gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

-

 !if $(EDK2_SKIP_PEICORE) == 1

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE

   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE

@@ -273,50 +67,7 @@
 

 [PcdsFixedAtBuild.common]

   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM RealView Emulation Board"

-  

   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ArmRealViewEb-A9x2"

-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32

-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

-  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000

-  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF

-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|1

-  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0

-  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320

-

-# DEBUG_ASSERT_ENABLED       0x01

-# DEBUG_PRINT_ENABLED        0x02

-# DEBUG_CODE_ENABLED         0x04

-# CLEAR_MEMORY_ENABLED       0x08

-# ASSERT_BREAKPOINT_ENABLED  0x10

-# ASSERT_DEADLOOP_ENABLED    0x20

-!if $(TARGET) == RELEASE

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21

-!else

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2f

-!endif

-

-#  DEBUG_INIT      0x00000001  // Initialization

-#  DEBUG_WARN      0x00000002  // Warnings

-#  DEBUG_LOAD      0x00000004  // Load events

-#  DEBUG_FS        0x00000008  // EFI File system

-#  DEBUG_POOL      0x00000010  // Alloc & Free's

-#  DEBUG_PAGE      0x00000020  // Alloc & Free's

-#  DEBUG_INFO      0x00000040  // Verbose

-#  DEBUG_DISPATCH  0x00000080  // PEI/DXE Dispatchers

-#  DEBUG_VARIABLE  0x00000100  // Variable

-#  DEBUG_BM        0x00000400  // Boot Manager

-#  DEBUG_BLKIO     0x00001000  // BlkIo Driver

-#  DEBUG_NET       0x00004000  // SNI Driver

-#  DEBUG_UNDI      0x00010000  // UNDI Driver

-#  DEBUG_LOADFILE  0x00020000  // UNDI Driver

-#  DEBUG_EVENT     0x00080000  // Event messages

-#  DEBUG_ERROR     0x80000000  // Error

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F

-

-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07

   

   #

   # NV Storage PCDs. Use base of 0x43F00000 for NOR0

@@ -328,22 +79,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x43FE0000

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00020000

 

-  gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""

-  gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07

-  gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000

-  

-#

-# Optional feature to help prevent EFI memory map fragments

-# Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob

-# Values are in EFI Pages (4K). DXE Core will make sure that 

-# at least this much of each type of memory can be allocated 

-# from a single memory range. This way you only end up with

-# maximum of two fragements for each type in the memory map

-# (the memory used, and the free memory that was prereserved

-# but not used).

-#

-  gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x00000000

-  

   gArmPlatformTokenSpaceGuid.PcdMPCoreSupport|1

   

   # Stacks for MPCores in Secure World

@@ -378,13 +113,16 @@
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000

   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000        # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms

   gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicInterruptNum|33

-  gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0x10011000

+  gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0x10011000 

+  gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase|0x10011020

   gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase|0x10012020

-  gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase|0x10012000

   

   ## PL031 RealTimeClock

   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x10017000

   

+  ## PL111 Lcd

+  gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x10020000

+  

   #

   # ARM PL011 - Serial Terminal

   #

@@ -398,20 +136,6 @@
   gArmTokenSpaceGuid.PcdGicNumInterrupts|96

 

   #

-  # ARM OS Loader

-  #

-  gArmTokenSpaceGuid.PcdArmMachineType|827

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"SemiHosting"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/zImage"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1

-  

-  # Use the Serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10

-  

-  #

   # ARM L2x0 PCDs

   #

   gArmTokenSpaceGuid.PcdL2x0ControllerBase|0x1F002000

@@ -423,14 +147,14 @@
 ################################################################################

 [Components.common]

   

-#

-# SEC

-#

+  #

+  # SEC

+  #

   ArmPlatformPkg/Sec/Sec.inf

   

-#

-# PEI Phase modules

-#

+  #

+  # PEI Phase modules

+  #

 !if $(EDK2_SKIP_PEICORE) == 1

   ArmPlatformPkg/PrePi/PeiMPCore.inf {

     <LibraryClasses>

@@ -460,9 +184,9 @@
   }

 !endif

 

-#

-# DXE

-#

+  #

+  # DXE

+  #

   MdeModulePkg/Core/Dxe/DxeMain.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

@@ -512,7 +236,6 @@
   FatPkg/EnhancedFatDxe/Fat.inf

   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

   

-  

   #

   # Application

   #