From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 11 Jul 2018 13:49:17 -0400 Subject: [PATCH] Make the linuxefi module just be the x86 efi version of linux Signed-off-by: Peter Jones --- grub-core/Makefile.core.def | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 81509b86a0d..804c964431e 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1710,6 +1710,8 @@ module = { module = { name = linux; x86 = loader/i386/linux.c; + x86_efi = loader/i386/efi/linux.c; + i386_efi = loader/i386/efi/linux.c; xen = loader/i386/xen.c; i386_pc = lib/i386/pc/vesa_modes_table.c; mips = loader/mips/linux.c; @@ -1717,13 +1719,14 @@ module = { sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c; ia64_efi = loader/ia64/efi/linux.c; arm = loader/arm/linux.c; - arm = loader/efi/linux.c; arm64 = loader/arm64/linux.c; - arm64 = loader/efi/linux.c; emu = loader/emu/linux.c; fdt = lib/fdt.c; + common = loader/linux.c; common = lib/cmdline.c; + + efi = loader/efi/linux.c; }; module = { @@ -1784,15 +1787,6 @@ module = { enable = x86_64_efi; }; -module = { - name = linuxefi; - efi = loader/i386/efi/linux.c; - efi = lib/cmdline.c; - efi = loader/efi/linux.c; - enable = i386_efi; - enable = x86_64_efi; -}; - module = { name = chain; efi = loader/efi/chainloader.c;