Platforms/ARM: Juno add IntelBds options

Neglected to copy IntelBds configuration across at import.
Do so now, but skip the conditionality.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

2 files changed, 13 insertions, 6 deletions

diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc
index 81f9dde..d96c861 100644
--- a/Platforms/ARM/Juno/ArmJuno.dsc
+++ b/Platforms/ARM/Juno/ArmJuno.dsc
@@ -42,6 +42,10 @@
   EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf

 

   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

   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

@@ -152,10 +156,7 @@
   #

   gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NOR Flash"

   gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/Image"

-

-  # Support the Linux EFI stub by default

   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0,115200 earlycon=pl011,0x7ff80000 root=/dev/sda1 rootwait verbose debug"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0

 

   # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"

@@ -167,6 +168,9 @@
   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|50000000

   gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

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

+

 [PcdsPatchableInModule]

   # Console Resolution (Full HD)

   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1920

@@ -292,5 +296,6 @@
   # Bds

   #

   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

-  ArmPlatformPkg/Bds/Bds.inf

-

+  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

diff --git a/Platforms/ARM/Juno/ArmJuno.fdf b/Platforms/ARM/Juno/ArmJuno.fdf
index 276485e..9f3b545 100644
--- a/Platforms/ARM/Juno/ArmJuno.fdf
+++ b/Platforms/ARM/Juno/ArmJuno.fdf
@@ -200,7 +200,9 @@ READ_LOCK_STATUS   = TRUE
   # Bds

   #

   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

-  INF ArmPlatformPkg/Bds/Bds.inf

+  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

 

   #

   # FDT installation