diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-04-07 14:07:00 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-04-07 14:35:08 +0200 |
| commit | e008d2ff99a4ab23d6da8c288e626cb23981c11c (patch) | |
| tree | 353df18f1abb8e5681b1dd409c097e948b4b3027 | |
| parent | 2777ed7068f0ce186761f5cfef8a0c2252e3e2a5 (diff) | |
| download | edk2-platforms-e008d2ff99a4ab23d6da8c288e626cb23981c11c.tar.xz | |
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>
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemu.dsc | 12 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemu.fdf | 5 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.dsc | 12 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.fdf | 5 |
4 files changed, 0 insertions, 34 deletions
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index c4275a389e..a820b639ec 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -390,15 +390,3 @@ #
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 9d1503cfc7..c973beb25c 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -240,11 +240,6 @@ READ_LOCK_STATUS = TRUE 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 b33e96f5d7..12ceb170cd 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -368,15 +368,3 @@ 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 472e0fe810..38bd1d3b3d 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -258,11 +258,6 @@ READ_LOCK_STATUS = TRUE 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
|