X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BeagleBoardPkg%2FBeagleBoardPkg.dsc;h=1a7b2cc280dca5c275dba5792c9fdc1e9a5f58b3;hb=ee686203fdf8743eae23ffbcf5837954cfafb9a5;hp=0a836a94264783cc207c3c8bafa09710450851fc;hpb=b830c1dfc06363bf4a33ede0e923c38043f66843;p=mirror_edk2.git

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 0a836a9426..1a7b2cc280 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -109,12 +109,12 @@
   OmapLib|Omap35xxPkg/Library/OmapLib/OmapLib.inf
   OmapDmaLib|Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
   EblNetworkLib|EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
-  
+  DebugAgentTimerLib|Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+
   GdbSerialLib|Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
-
-UsbLib|AppleCommonPkg/Library/AppleUsbLib/AppleUsbDxeLib.inf
+  DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
 
 [LibraryClasses.common.SEC]
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
@@ -123,13 +123,20 @@ UsbLib|AppleCommonPkg/Library/AppleUsbLib/AppleUsbDxeLib.inf
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
   LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+
+# Temp work around for Movt relocation issue. 
+  PeCoffLib|ArmPkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+#  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+  
   HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf
   PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.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
+
 [LibraryClasses.common.PEI_CORE]
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
@@ -190,6 +197,10 @@ UsbLib|AppleCommonPkg/Library/AppleUsbLib/AppleUsbDxeLib.inf
   XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv7
   XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 
 
+  GCC:*_*_ARM_ARCHCC_FLAGS     == -march=armv7-a -mthumb
+  GCC:*_*_ARM_ARCHASM_FLAGS    == -march=armv7-a
+  GCC:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 
+
   RVCT:*_*_ARM_ARCHCC_FLAGS  == --cpu Cortex-A8 --thumb
   RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu Cortex-A8 
   RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG 
@@ -353,7 +364,14 @@ UsbLib|AppleCommonPkg/Library/AppleUsbLib/AppleUsbDxeLib.inf
   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
   EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
-  EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
+  
+  EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf 
+#
+# This version uses semi-hosting console  
+#  EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf {
+#    <LibraryClasses>
+#      SerialPortLib|ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
+#  }
   
   EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
   EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
@@ -387,13 +405,6 @@ UsbLib|AppleCommonPkg/Library/AppleUsbLib/AppleUsbDxeLib.inf
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
-  AppleCommonPkg/Bus/Pci/EhciDxe/Ehci.inf
-  AppleCommonPkg/Bus/Usb/UsbBotDxe/UsbBot.inf
-  AppleCommonPkg/Bus/Usb/UsbCbiDxe/Cbi0/UsbCbi0.inf
-  AppleCommonPkg/Bus/Usb/UsbCbiDxe/Cbi1/UsbCbi1.inf
-  AppleCommonPkg/Bus/Usb/UsbBusDxe/UsbBus.inf
-  AppleCommonPkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorage.inf
-
   #
   # Nand Flash
   #