ArmVirtPkg: remove linux loader from ARM builds

The built in Linux loader was a temporary solution to boot ARM Linux
without EFI support in the OS. Now that EFI support is merged in the
upstream v4.5 release, we no longer need it. So drop it.

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

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index c4275a389e2b391881e721f73418bfa8bf145f50..a820b639eccc06b9ef29b54138059a58b4779630 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -390,15 +390,3 @@
   #\r
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
-\r
-[Components.ARM]\r
-  #\r
-  # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need\r
-  # an intermediate OS loader. Add the LinuxLoader UEFI application so we can\r
-  # invoke it from the shell.\r
-  #\r
-  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {\r
-    <LibraryClasses>\r
-      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
-  }\r

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 9d1503cfc7c8f7c491fab5dd4ba7040a99e17f82..c973beb25cde4f2724bbfec3f51c61f74f4d154d 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -240,11 +240,6 @@ READ_LOCK_STATUS   = TRUE
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
 \r
-!if $(ARCH) == ARM\r
-  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
-!endif\r
-\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index b33e96f5d7e8cc5c15882d82ab643150a59c6e11..12ceb170cd52dfde622337780bb8a3d25f5ecda0 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -368,15 +368,3 @@
   MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
-\r
-[Components.ARM]\r
-  #\r
-  # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need\r
-  # an intermediate OS loader. Add the LinuxLoader UEFI application so we can\r
-  # invoke it from the shell.\r
-  #\r
-  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {\r
-    <LibraryClasses>\r
-      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
-  }\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index 472e0fe810d4a369bc574955e932f8a18f5247d7..38bd1d3b3d7482f3e3ed4aa5b285b68fdc3d7934 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -258,11 +258,6 @@ READ_LOCK_STATUS   = TRUE
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
 \r
-!if $(ARCH) == ARM\r
-  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
-!endif\r
-\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r