BeagleBoardPkg: Replaced the original DSC/FDF files by their new versions that use...

[mirror_edk2.git] / BeagleBoardPkg / BeagleBoardPkg.dsc

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 1410c41c69eb34d5bb44ae7eedc9be082d86c720..3648209cfcbc96f97d88560118fe033d34113e44 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -27,7 +27,7 @@
   SUPPORTED_ARCHITECTURES        = ARM\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
-  FLASH_DEFINITION               = BeagleBoardPkg/BeagleBoardPkg.fdf\r
+  FLASH_DEFINITION               = BeagleBoardPkg/BeagleBoardPkg-next.fdf\r
 \r
 \r
 [LibraryClasses.common]\r
@@ -45,8 +45,8 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
 \r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
+  ArmPlatformLib|BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf\r
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
-  PrePiHobListPointerLib|EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf\r
   \r
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
   BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf\r
@@ -82,7 +82,7 @@
   SerialPortLib|Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf\r
   SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf\r
   \r
-  RealTimeClockLib|EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf\r
+  RealTimeClockLib|Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf\r
 \r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   \r
@@ -125,19 +125,24 @@
 \r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf\r
+  ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf\r
+  \r
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf\r
   LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
 \r
-# Temp work around for Movt relocation issue. \r
-  PeCoffLib|ArmPkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
-#  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
+  # Temp work around for Movt relocation issue. \r
+  #PeCoffLib|ArmPkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
   \r
   HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf\r
+  PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf\r
   MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf\r
   PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf\r
+  PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf\r
+  MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf\r
   \r
   # 1/123 faster than Stm or Vstm version\r
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf\r
@@ -169,7 +174,6 @@
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf\r
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf\r
 \r
-\r
 [LibraryClasses.common.UEFI_APPLICATION]\r
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
   UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf\r
@@ -288,8 +292,7 @@
 #  DEBUG_LOADFILE  0x00020000  // UNDI Driver\r
 #  DEBUG_EVENT     0x00080000  // Event messages\r
 #  DEBUG_ERROR     0x80000000  // Error\r
-\r
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F\r
 \r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
 \r
@@ -297,9 +300,6 @@
   gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000\r
   \r
-  gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase|0\r
-  gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize|0\r
-\r
 #\r
 # Optional feature to help prevent EFI memory map fragments\r
 # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob\r
@@ -324,17 +324,18 @@
 #\r
 # Beagle board Specific PCDs\r
 #\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0x80001000\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0x87FE0000 # stack at top of memory\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|0x20000  # 128K stack\r
+  gArmTokenSpaceGuid.PcdVFPEnabled|1\r
   \r
-  gEmbeddedTokenSpaceGuid.PcdMemoryBase|0x80000000\r
-  gEmbeddedTokenSpaceGuid.PcdMemorySize|0x10000000\r
-\r
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000\r
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x10000000\r
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x08000000\r
+\r
+  # Size of the region used by UEFI in permanent memory (Reserved 16MB)\r
+  gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x01000000\r
+  \r
+  # Size of the region reserved for fixed address allocations (Reserved 32MB)\r
+  gArmTokenSpaceGuid.PcdArmLinuxKernelMaxOffset|0x02000000\r
 \r
-  gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x80000000\r
+  gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x80008000\r
   gArmTokenSpaceGuid.PcdCpuResetAddress|0x80008000\r
   \r
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000\r
@@ -352,8 +353,8 @@
   gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
   gArmPlatformTokenSpaceGuid.PcdFdtDevicePath|L"VenHw(B615F1F5-5088-43CD-809C-A16E52487D00)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/omap3-beagle.dtb"\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(6696936D-3637-467C-87CB-14EA8248948C)/Uart(115200,8,N,1)/VenPcAnsi()"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(6696936D-3637-467C-87CB-14EA8248948C)/Uart(115200,8,N,1)/VenPcAnsi()"\r
+  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"\r
+  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"\r
 \r
   #\r
   # ARM OS Loader\r
@@ -368,14 +369,14 @@
 ################################################################################\r
 [Components.common]\r
 \r
-#\r
-# SEC\r
-#\r
-  BeagleBoardPkg/Sec/Sec.inf\r
+  #\r
+  # SEC\r
+  #\r
+  ArmPlatformPkg/PrePi/PeiUniCore.inf\r
   \r
-#\r
-# DXE\r
-#\r
+  #\r
+  # DXE\r
+  #\r
   MdeModulePkg/Core/Dxe/DxeMain.inf {\r
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
@@ -393,7 +394,6 @@
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
   EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf\r
   \r
-  EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf\r
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf  \r
@@ -446,10 +446,8 @@
   #\r
   # MMC/SD\r
   #\r
-  Omap35xxPkg/MMCHSDxe/MMCHS.inf {\r
-    <PcdsFixedAtBuild>\r
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800fffff\r
-  }\r
+  EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
+  Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf\r
   \r
   #\r
   # I2C\r