[edk2,1/2] ArmVirtPkg: remove linux loader from ARM builds

Message ID 1460031097-5853-1-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel April 7, 2016, 12:11 p.m.
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>

---
 ArmVirtPkg/ArmVirtQemu.dsc       | 12 ------------
 ArmVirtPkg/ArmVirtQemu.fdf       |  5 -----
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 12 ------------
 ArmVirtPkg/ArmVirtQemuKernel.fdf |  5 -----
 4 files changed, 34 deletions(-)

-- 
2.5.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Laszlo Ersek April 7, 2016, 12:31 p.m. | #1
On 04/07/16 14:11, Ard Biesheuvel wrote:
> 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>

> ---

>  ArmVirtPkg/ArmVirtQemu.dsc       | 12 ------------

>  ArmVirtPkg/ArmVirtQemu.fdf       |  5 -----

>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 12 ------------

>  ArmVirtPkg/ArmVirtQemuKernel.fdf |  5 -----

>  4 files changed, 34 deletions(-)


Reviewed-by: Laszlo Ersek <lersek@redhat.com>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index ab29b8450185..80606d76ae72 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -388,15 +388,3 @@  [Components.AARCH64]
   #
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
-
-[Components.ARM]
-  #
-  # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need
-  # an intermediate OS loader. Add the LinuxLoader UEFI application so we can
-  # invoke it from the shell.
-  #
-  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {
-    <LibraryClasses>
-      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
-  }
diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index f432e40c43eb..3745512c835a 100644
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -236,11 +236,6 @@  [FV.FvMain]
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp
   }
 
-!if $(ARCH) == ARM
-  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
-  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf
-!endif
-
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 16
 ERASE_POLARITY     = 1
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index a590b42fe235..7af7a4ad6359 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -363,15 +363,3 @@  [Components.common]
   MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-
-[Components.ARM]
-  #
-  # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need
-  # an intermediate OS loader. Add the LinuxLoader UEFI application so we can
-  # invoke it from the shell.
-  #
-  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {
-    <LibraryClasses>
-      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
-  }
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index 1a9338629974..e4e8095b8bec 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -254,11 +254,6 @@  [FV.FvMain]
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp
   }
 
-!if $(ARCH) == ARM
-  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
-  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf
-!endif
-
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 16
 ERASE_POLARITY     = 1