On 26 October 2016 at 11:29, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:

Replace the Intel BDS with the generic BDS.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org

Tested when stacked on top of the "[PATCH 0/5] Platforms/ARM: get rid of ARM BDS" series. Tested on Juno R0/1/2, TC2 and FVP AEMv8 and Foundation models.

Tested-by: Ryan Harkin ryan.harkin@linaro.org

---

Platforms/ARM/Juno/ArmJuno.dsc | 10 +++++++--- Platforms/ARM/Juno/ArmJuno.fdf | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc index d5f06c2b4211..f9824f0f837e 100644 --- a/Platforms/ARM/Juno/ArmJuno.dsc +++ b/Platforms/ARM/Juno/ArmJuno.dsc @@ -45,8 +45,6 @@

TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

• GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

• PlatformBdsLib|ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

  # USB Requirements

@@ -335,7 +333,13 @@ MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

• IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.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
  

• }

  # # EBC

diff --git a/Platforms/ARM/Juno/ArmJuno.fdf b/Platforms/ARM/Juno/ArmJuno.fdf index 9e41ce87cbc2..f760c128744b 100644 --- a/Platforms/ARM/Juno/ArmJuno.fdf +++ b/Platforms/ARM/Juno/ArmJuno.fdf @@ -214,7 +214,8 @@ FvNameGuid = B73FE497-B92E-416e-8326-45AD0D270092 INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

• INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

• INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

• INF MdeModulePkg/Application/UiApp/UiApp.inf

  # # FDT installation

-- 2.7.4