ARM Packages: Replaced the build of Fat driver and EBL by the binaries of Fat driver and UEFI Shell

Signed-off-by: Olivier Martin <olivier.martin@arm.com>



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

2 files changed, 20 insertions, 17 deletions

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 10b785e099..db6ba895ca 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -59,8 +59,6 @@
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

   

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

-  

   EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf

   

   

@@ -108,15 +106,12 @@
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

   

   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

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

-  

 

   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

 

   TimerLib|Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf  

   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

@@ -426,7 +421,6 @@
   #

   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-  FatPkg/EnhancedFatDxe/Fat.inf

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

 

   #

@@ -474,11 +468,6 @@
   Omap35xxPkg/TPS65950Dxe/TPS65950.inf

   

   #

-  # Application

-  #  

-  EmbeddedPkg/Ebl/Ebl.inf

-  

-  #

   # Bds

   #

   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index 27f5167e56..1bb593dfbe 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -28,10 +28,10 @@
 

 [FD.BeagleBoard_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          = 0x000A0000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device

 ErasePolarity = 1

 BlockSize     = 0x1

-NumBlocks     = 0x80000

+NumBlocks     = 0xA0000

 

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

 #

@@ -48,7 +48,7 @@ NumBlocks     = 0x80000
 # RegionType <FV, DATA, or FILE>

 #

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

-0x00000000|0x00080000

+0x00000000|0x000A0000

 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize

 FV = FVMAIN_COMPACT

 

@@ -148,7 +148,7 @@ READ_LOCK_STATUS   = TRUE
   #

   INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-  INF FatPkg/EnhancedFatDxe/Fat.inf

+  INF FatBinPkg/EnhancedFatDxe/Fat.inf

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

 

   #

@@ -164,7 +164,7 @@ READ_LOCK_STATUS   = TRUE
   #

   # UEFI application (Shell Embedded Boot Loader) 

   #  

-  INF EmbeddedPkg/Ebl/Ebl.inf

+  INF ShellBinPkg/UefiShell/UefiShell.inf 

 

   #

   # Bds

@@ -284,9 +284,23 @@ READ_LOCK_STATUS   = TRUE
     UI           STRING="$(MODULE_NAME)" Optional

   }

 

-

 [Rule.Common.UEFI_APPLICATION]

   FILE APPLICATION = $(NAMED_GUID) {

     UI     STRING ="$(MODULE_NAME)" Optional         

     PE32   PE32                         $(INF_OUTPUT)/$(MODULE_NAME).efi

   }

+

+[Rule.Common.UEFI_DRIVER.BINARY]

+  FILE DRIVER = $(NAMED_GUID) {

+    DXE_DEPEX DXE_DEPEX Optional      |.depex

+    PE32      PE32                    |.efi

+    UI        STRING="$(MODULE_NAME)" Optional

+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[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)

+  }