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

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 8c54242b597b45e2b93269022c6597a5116e6a8f..ced45c8194bc3d1162717438993ff82334219ae2 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -106,8 +106,7 @@
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf\r
   DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf\r
 \r
-  # BDS Libraries\r
-  BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
+  # Flattened Device Tree (FDT) access library\r
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf\r
 \r
   # PCI Libraries\r
@@ -279,8 +278,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE\r
 \r
 [PcdsFixedAtBuild.common]\r
-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Virtualization Platform"\r
-\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000\r

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index c199cac72cfddfc42991ff7c18069d6ebe1c1324..5a644090be7c1de83ed81e7ad750c51faddd346f 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -57,13 +57,11 @@
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
   NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf\r
 \r
-!if $(INTEL_BDS) == TRUE\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
   GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf\r
   PlatformBdsLib|ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf\r
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf\r
-!endif\r
 \r
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
@@ -99,8 +97,6 @@
   gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE\r
 \r
 [PcdsFixedAtBuild.common]\r
-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"QEMU"\r
-\r
   gArmPlatformTokenSpaceGuid.PcdCoreCount|1\r
 !if $(ARCH) == AARCH64\r
   gArmTokenSpaceGuid.PcdVFPEnabled|1\r
@@ -127,29 +123,11 @@
   ## PL011 - Serial Terminal\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|38400\r
 \r
-  #\r
-  # ARM OS Loader\r
-  #\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux (EFI stub) on virtio31:hd0:part0"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(837DCA9E-E874-4D82-B29A-23FE0E23D1E2,003E000A00000000)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/Image"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"root=/dev/vda2 console=ttyAMA0 earlycon uefi_debug"\r
-\r
-  #\r
-  # Settings for ARM BDS -- use the serial console (ConIn & ConOut).\r
-  #\r
-!if $(TTY_TERMINAL) == TRUE\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"\r
-  ## Terminal Type - TTYTERM, consistent with ConOut/ConIn Device Path.\r
+  ## Default Terminal Type\r
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
+!if $(TTY_TERMINAL) == TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r
 !else\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()"\r
-  ## Terminal Type - VT100, consistent with ConOut/ConIn Device Path.\r
-  ## When Intel BDS is enabled, the above ConOut/ConIn device path is useless,\r
-  ## but we still use VT100 terminal type when TTY_TERMINAL is not TRUE.\r
-  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
 !endif\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
@@ -175,10 +153,8 @@
   # initial location of the device tree blob passed by QEMU -- base of DRAM\r
   gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000\r
 \r
-!if $(INTEL_BDS) == TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
-!endif\r
 \r
   #\r
   # The maximum physical I/O addressability of the processor, set with\r
@@ -332,13 +308,9 @@
   # Bds\r
   #\r
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-!if $(INTEL_BDS) == TRUE\r
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
   IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-!else\r
-  ArmPlatformPkg/Bds/Bds.inf\r
-!endif\r
 \r
   #\r
   # SCSI Bus and Disk Driver\r

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 3c0487cd95b637dc679765f8fc1c860814d9540a..a9ad9ca6fe2d006714a52d3145ac2dbe58775250 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -171,13 +171,9 @@ READ_LOCK_STATUS   = TRUE
   # Bds\r
   #\r
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-!if $(INTEL_BDS) == TRUE\r
   INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
   INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
   INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-!else\r
-  INF ArmPlatformPkg/Bds/Bds.inf\r
-!endif\r
 \r
   #\r
   # Networking stack\r
@@ -234,14 +230,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 \r
-!if $(INTEL_BDS) == TRUE\r
   #\r
   # TianoCore logo (splash screen)\r
   #\r
   FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
-!endif\r
 \r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r