Fix grammer in comment

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

3 files changed, 26 insertions, 11 deletions

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index dc601525b..0a836a942 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -1,7 +1,7 @@
 #/** @file
 # Beagle board package.
 #
-# Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
+# Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
 #    are licensed and made available under the terms and conditions of the BSD License
@@ -36,7 +36,8 @@
   UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
 !else
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  UncachedMemoryAllocationLib|ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf
+  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
+#  UncachedMemoryAllocationLib|ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf
 !endif
 
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
@@ -113,6 +114,8 @@
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
 
+UsbLib|AppleCommonPkg/Library/AppleUsbLib/AppleUsbDxeLib.inf
+
 [LibraryClasses.common.SEC]
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
@@ -384,6 +387,12 @@
   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
@@ -393,7 +402,10 @@
   #
   # MMC/SD
   #
-  Omap35xxPkg/MMCHSDxe/MMCHS.inf
+  Omap35xxPkg/MMCHSDxe/MMCHS.inf {
+    <PcdsFixedAtBuild>
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800fffff
+  }
   
   #
   # I2C
diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index d1d6e4774..d19622c8f 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -156,9 +156,16 @@ READ_LOCK_STATUS   = TRUE
 
   #NOTE: Open source EHCI stack doesn't work on Beagleboard.
   #NOTE: UsbBus and UsbMassStorage don't work using iPhond SDK tool chain.
-  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+##  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+##  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+##  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
+  INF AppleCommonPkg/Bus/Pci/EhciDxe/Ehci.inf 
+  INF AppleCommonPkg/Bus/Usb/UsbBotDxe/UsbBot.inf
+  INF AppleCommonPkg/Bus/Usb/UsbCbiDxe/Cbi0/UsbCbi0.inf
+  INF AppleCommonPkg/Bus/Usb/UsbCbiDxe/Cbi1/UsbCbi1.inf
+  INF AppleCommonPkg/Bus/Usb/UsbBusDxe/UsbBus.inf
+  INF AppleCommonPkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorage.inf
 
   #
   # UEFI application (Shell Embedded Boot Loader) 
@@ -171,10 +178,6 @@ READ_LOCK_STATUS   = TRUE
   #
   INF BeagleBoardPkg/Bds/Bds.inf
 
-  #
-  # Gdb Stub
-  #
-  #INF ArmPkg/Drivers/DebugSupportDxe/DebugSupportDxe.inf
 
 
 [FV.FVMAIN_COMPACT]
diff --git a/BeagleBoardPkg/Sec/Sec.c b/BeagleBoardPkg/Sec/Sec.c
index 931fb58ee..50db72ae6 100644
--- a/BeagleBoardPkg/Sec/Sec.c
+++ b/BeagleBoardPkg/Sec/Sec.c
@@ -159,7 +159,7 @@ CEntryPoint (
 

   DEBUG ((EFI_D_ERROR, "UART Enabled\n"));

 

-  // Start up a free running time so that the timer lib will work

+  // Start up a free running timer so that the timer lib will work

   TimerInit ();

 

   // SEC phase needs to run library constructors by hand.