ArmVirtPkg/ArmVirtQemu: drop ARM BDS and make Intel BDS the default

ARM BDS support in ArmVirtQemu has been broken since SVN r17969
("ArmPkg/BdsLib: Remove Linux loader from BdsLib") dated July 14th.

Instead of fixing this, let's get rid of the ARM BDS and LinuxLoader
altogether: they violate both the UEFI spec and the arm64 Linux boot
protocol, and lack the level of integration with the QEMU command
line that the Intel BDS has when running under ArmVirtPkg or OvmfPkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18153 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 3 insertions, 40 deletions

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 8c54242b59..ced45c8194 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -106,8 +106,7 @@
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

   DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf

 

-  # BDS Libraries

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

+  # Flattened Device Tree (FDT) access library

   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf

 

   # PCI Libraries

@@ -279,8 +278,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

 

 [PcdsFixedAtBuild.common]

-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Virtualization Platform"

-

   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index c199cac72c..5a644090be 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -57,13 +57,11 @@
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

   NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf

 

-!if $(INTEL_BDS) == TRUE

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

   GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

   PlatformBdsLib|ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf

   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf

-!endif

 

 [LibraryClasses.common.UEFI_DRIVER]

   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

@@ -99,8 +97,6 @@
   gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE

 

 [PcdsFixedAtBuild.common]

-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"QEMU"

-

   gArmPlatformTokenSpaceGuid.PcdCoreCount|1

 !if $(ARCH) == AARCH64

   gArmTokenSpaceGuid.PcdVFPEnabled|1

@@ -127,29 +123,11 @@
   ## PL011 - Serial Terminal

   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|38400

 

-  #

-  # ARM OS Loader

-  #

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux (EFI stub) on virtio31:hd0:part0"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(837DCA9E-E874-4D82-B29A-23FE0E23D1E2,003E000A00000000)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/Image"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"root=/dev/vda2 console=ttyAMA0 earlycon uefi_debug"

-

-  #

-  # Settings for ARM BDS -- use the serial console (ConIn & ConOut).

-  #

-!if $(TTY_TERMINAL) == TRUE

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"

-  ## Terminal Type - TTYTERM, consistent with ConOut/ConIn Device Path.

+  ## Default Terminal Type

   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

+!if $(TTY_TERMINAL) == TRUE

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

 !else

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()"

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

-  ## Terminal Type - VT100, consistent with ConOut/ConIn Device Path.

-  ## When Intel BDS is enabled, the above ConOut/ConIn device path is useless,

-  ## but we still use VT100 terminal type when TTY_TERMINAL is not TRUE.

-  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1

 !endif

   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

@@ -175,10 +153,8 @@
   # initial location of the device tree blob passed by QEMU -- base of DRAM

   gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000

 

-!if $(INTEL_BDS) == TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

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

-!endif

 

   #

   # The maximum physical I/O addressability of the processor, set with

@@ -332,13 +308,9 @@
   # Bds

   #

   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

-!if $(INTEL_BDS) == TRUE

   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

   IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

-!else

-  ArmPlatformPkg/Bds/Bds.inf

-!endif

 

   #

   # SCSI Bus and Disk Driver

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 3c0487cd95..a9ad9ca6fe 100644
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -171,13 +171,9 @@ READ_LOCK_STATUS   = TRUE
   # Bds

   #

   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

-!if $(INTEL_BDS) == TRUE

   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

 

   #

   # Networking stack

@@ -234,14 +230,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

 

-!if $(INTEL_BDS) == TRUE

   #

   # TianoCore logo (splash screen)

   #

   FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {

     SECTION RAW = MdeModulePkg/Logo/Logo.bmp

   }

-!endif

 

 [FV.FVMAIN_COMPACT]

 FvAlignment        = 16