BeagleBoardPkg: move to generic BDS

Drop the ARM BDS and related dependencies, and switch to the generic
BDS instead.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

2 files changed, 56 insertions, 11 deletions

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 1e21ed1463..2951c689c7 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -128,9 +128,17 @@
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

 

   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

-  BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf

   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf

 

+  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

+  PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

+  CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

+

+  # UiApp dependencies

+  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

+

 [LibraryClasses.common.SEC]

   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

@@ -328,6 +336,7 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|10

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

 

+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

 

 #

 # Beagle board Specific PCDs

@@ -368,6 +377,14 @@
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(E68088EF-D1A4-4336-C1DB-4D3A204730A6)"

   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

 

+  # GUID of the UEFI Shell

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }

+

+  # GUID of the UI app

+  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

+

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

 #

 # Components Section - list of all EDK II Modules needed by this Platform

@@ -475,13 +492,38 @@
   #

   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

-  ArmPlatformPkg/Bds/Bds.inf

-

-  # Legacy Linux Loader

-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf

+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+  MdeModulePkg/Application/UiApp/UiApp.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf

+  }

+  ShellPkg/Application/Shell/Shell.inf {

+    <LibraryClasses>

+      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

+      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf

+      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf

+      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

+      BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

 

-  #

-  # Example Application

-  #

-  MdeModulePkg/Application/HelloWorld/HelloWorld.inf

+    <PcdsFixedAtBuild>

+      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000

+  }

 

+  # Legacy Linux Loader

+  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {

+    <LibraryClasses>

+      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf

+  }

diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index 733b5a43d3..fcaf44abb5 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -175,14 +175,17 @@ FvNameGuid         = d0dd3e90-343d-4cb3-8f69-772214989282
   #

   # UEFI application (Shell Embedded Boot Loader)

   #

-  INF ShellBinPkg/UefiShell/UefiShell.inf

+  INF ShellPkg/Application/Shell/Shell.inf

 

   #

   # Bds

   #

   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

-  INF ArmPlatformPkg/Bds/Bds.inf

+  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+  INF MdeModulePkg/Application/UiApp/UiApp.inf

 

   # Legacy Linux Loader

   INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf