Select IntelBds instead of the ARM Bds when building with -D INTEL_BDS. This also updates ArmJunoDxe to use ArmBdsHelperLib instead of the BdsLib directly.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm <[email protected]> --- ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc | 19 +++++++++++++++++++ ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf | 6 ++++++ .../ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 2 +- .../ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc index c962856..c42854e 100644 --- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc +++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc @@ -39,6 +39,14 @@ TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf + ArmBdsHelperLib|ArmPkg/Library/ArmBdsHelperLib/ArmBdsHelperLib.inf +!ifdef INTEL_BDS + 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 + # USB Requirements UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf @@ -146,6 +154,11 @@ gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|50000000 gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000 +!ifdef INTEL_BDS + gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE + gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } +!endif + [PcdsPatchableInModule] # Console Resolution (Full HD) gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1920 @@ -236,5 +249,11 @@ # Bds # MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +!ifdef INTEL_BDS + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf +!else ArmPlatformPkg/Bds/Bds.inf +!endif diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf index 34b190d..96a80a7 100644 --- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf +++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf @@ -171,7 +171,13 @@ READ_LOCK_STATUS = TRUE # Bds # INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +!ifdef INTEL_BDS + INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf +!else INF ArmPlatformPkg/Bds/Bds.inf +!endif [FV.FVMAIN_COMPACT] FvAlignment = 8 diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index bf930d2..2b23ab4 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -32,9 +32,9 @@ MdePkg/MdePkg.dec [LibraryClasses] + ArmBdsHelperLib ArmShellCmdRunAxfLib BaseMemoryLib - BdsLib DebugLib DmaLib DxeServicesTableLib diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c index a4220a1..4ccd5d3 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c @@ -19,8 +19,8 @@ #include <Protocol/DriverBinding.h> #include <Protocol/SimpleFileSystem.h> +#include <Library/ArmBdsHelperLib.h> #include <Library/BaseMemoryLib.h> -#include <Library/BdsLib.h> #include <Library/DevicePathLib.h> #include <Library/MemoryAllocationLib.h> #include <Library/PrintLib.h> -- 2.1.3 ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
