panda: rebase to latest uefi-next tree

rebase to latest commit -d 99af201b87a6048c26f372e3f75a46d291b2f683
in http://git.linaro.org/gitweb?p=arm/uefi/uefi-next.git

only fixes dos2unix cr/lf
no functional change

5 files changed, 18 insertions, 15 deletions

diff --git a/PandaBoardPkg/Debugger_scripts/rvi_convert_symbols.sh b/PandaBoardPkg/Debugger_scripts/rvi_convert_symbols.sh
index 9567f5c62..9567f5c62 100755..100644
--- a/PandaBoardPkg/Debugger_scripts/rvi_convert_symbols.sh
+++ b/PandaBoardPkg/Debugger_scripts/rvi_convert_symbols.sh
diff --git a/PandaBoardPkg/Debugger_scripts/rvi_symbols_macros.inc b/PandaBoardPkg/Debugger_scripts/rvi_symbols_macros.inc
index 9e7f42774..9e7f42774 100755..100644
--- a/PandaBoardPkg/Debugger_scripts/rvi_symbols_macros.inc
+++ b/PandaBoardPkg/Debugger_scripts/rvi_symbols_macros.inc
diff --git a/PandaBoardPkg/Debugger_scripts/rvi_unload_symbols.inc b/PandaBoardPkg/Debugger_scripts/rvi_unload_symbols.inc
index 546c4f960..546c4f960 100755..100644
--- a/PandaBoardPkg/Debugger_scripts/rvi_unload_symbols.inc
+++ b/PandaBoardPkg/Debugger_scripts/rvi_unload_symbols.inc
diff --git a/PandaBoardPkg/Debugger_scripts/trace32_load_symbols.cmm b/PandaBoardPkg/Debugger_scripts/trace32_load_symbols.cmm
index c2178e26b..c70a67393 100644
--- a/PandaBoardPkg/Debugger_scripts/trace32_load_symbols.cmm
+++ b/PandaBoardPkg/Debugger_scripts/trace32_load_symbols.cmm
@@ -178,7 +178,7 @@ load_symbol_file:
     ENTRY &filestring
 
     // the below has to be customized per your environment
-    &filestring="y:"+string.mid("&filestring", 32., string.len("&filestring"))
+    &filestring="x:"+string.mid("&filestring", 36., string.len("&filestring"))
 
     PRINT "&filestring 0x" &load_address
     TDIAG Data.load.elf &filestring &load_address /nocode /noclear
diff --git a/PandaBoardPkg/PandaBoardPkg.fdf b/PandaBoardPkg/PandaBoardPkg.fdf
index 4b86f6957..1f305a568 100644
--- a/PandaBoardPkg/PandaBoardPkg.fdf
+++ b/PandaBoardPkg/PandaBoardPkg.fdf
@@ -28,10 +28,10 @@
 
 [FD.PandaBoard_EFI]
 BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
-Size          = 0x00080000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device
+Size          = 0x00100000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device
 ErasePolarity = 1
 BlockSize     = 0x1
-NumBlocks     = 0x80000
+NumBlocks     = 0x100000
 
 ################################################################################
 #
@@ -49,12 +49,12 @@ NumBlocks     = 0x80000
 #
 ################################################################################
 !if $(EDK2_SECOND_STAGE_BOOTOLADER) == 1
-0x00000000|0x00080000
+0x00000000|0x00100000
 !else
 # 512 bytes of configuration header & 8 bytes of image header
 0x00000000|0x00000208
 
-0x00000208|0x0007FDF8
+0x00000208|0x000FFDF8
 !endif
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
@@ -125,7 +125,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Nand Flash
   #
-  INF Omap44xxPkg/Flash/Flash.inf
+  #INF Omap44xxPkg/Flash/Flash.inf
 
   #
   # MMC/SD
@@ -142,9 +142,6 @@ READ_LOCK_STATUS   = TRUE
   # SoC Drivers
   #
   INF Omap44xxPkg/Gpio/Gpio.inf
-
-#  INF Omap44xxPkg/InterruptDxe/InterruptDxe.inf
-  
   INF Omap44xxPkg/TimerDxe/TimerDxe.inf 
   INF Omap44xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
 
@@ -165,16 +162,15 @@ READ_LOCK_STATUS   = TRUE
   # USB Support
   #
 
-  INF Omap44xxPkg/PciEmulation/PciEmulation.inf
-
-  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+  #INF Omap44xxPkg/PciEmulation/PciEmulation.inf
+  #INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+  #INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  #INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
   #
   # UEFI application (Shell Embedded Boot Loader) 
   #  
-  INF EmbeddedPkg/Ebl/Ebl.inf
+  INF ShellBinPkg/UefiShell/UefiShell.inf
 
   #
   # Bds
@@ -300,3 +296,10 @@ READ_LOCK_STATUS   = TRUE
     UI     STRING ="$(MODULE_NAME)" Optional         
     PE32   PE32                         $(INF_OUTPUT)/$(MODULE_NAME).efi
   }
+
+[Rule.Common.UEFI_APPLICATION.BINARY]
+  FILE APPLICATION = $(NAMED_GUID) {
+    PE32      PE32                    |.efi
+    UI        STRING="$(MODULE_NAME)" Optional
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+  }