ArmPlatformPkg/ArmVExpressPkg: add support for the Intel BDS

This adds support for the Intel BDS, by introducing a define
'USE_ARM_BDS' which defaults to TRUE, and can be overridden on
the build command line.

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

3 files changed, 34 insertions, 0 deletions

diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc
index 37b024e..ba8d98c 100644
--- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc
+++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc
@@ -330,4 +330,10 @@
   # Bds

   #

   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

+!if $(USE_ARM_BDS) == TRUE

   ArmPlatformPkg/Bds/Bds.inf

+!else

+  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

+!endif

diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
index f212807..0c7b938 100644
--- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
+++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
@@ -217,7 +217,20 @@ FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0
   # Bds

   #

   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

+!if $(USE_ARM_BDS) == TRUE

   INF ArmPlatformPkg/Bds/Bds.inf

+!else

+  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

+

+  #

+  # TianoCore logo (splash screen)

+  #

+  FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {

+   SECTION RAW = MdeModulePkg/Logo/Logo.bmp

+  }

+!endif

 

   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
index a7b7779..cc3563e 100644
--- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
+++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
@@ -11,6 +11,9 @@
 #

 #

 

+[Defines]

+  USE_ARM_BDS         = TRUE

+

 [BuildOptions.AARCH64.EDKII.DXE_RUNTIME_DRIVER]

   GCC:*_*_AARCH64_DLINK_FLAGS = --script=$(EDK_TOOLS_PATH)/Scripts/gcc-aarch64-64K-align-ld-script

 

@@ -129,6 +132,13 @@
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

 

+!if $(USE_ARM_BDS) == FALSE

+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

+  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

+  PlatformBdsLib|ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf

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

+!endif

+

 [LibraryClasses.common.SEC]

   ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf

   ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Sec/SecArmPlatformGlobalVariableLib.inf

@@ -393,6 +403,11 @@
   # Shell.

   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

 

+!if $(USE_ARM_BDS) == FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

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

+!endif

+

 !ifdef EDK2_ENABLE_SMSC_91X

   # Ethernet (SMSC 91C111)

   gLan91xDxeTokenSpaceGuid.PcdLan91xDxeBaseAddress|0x1A000000