Nerf the fdt command out of arm64 builds

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-07-12 11:06:40 -04:00
parent 244d5814a5
commit 3e6c63597b

View File

@ -3,16 +3,26 @@ From: Peter Jones <pjones@redhat.com>
Date: Thu, 12 Jul 2018 11:00:45 -0400 Date: Thu, 12 Jul 2018 11:00:45 -0400
Subject: [PATCH] Don't build the fdt command. Subject: [PATCH] Don't build the fdt command.
Don't build the fdt command separately but *do* build it into the arm64 kernel.
Signed-off-by: Peter Jones <pjones@redhat.com> Signed-off-by: Peter Jones <pjones@redhat.com>
--- ---
grub-core/Makefile.core.def | 2 ++ grub-core/Makefile.core.def | 3 +++
1 file changed, 2 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 9039a6f73a3..a6cb7b9009c 100644 index 9039a6f73a3..aabe53262f0 100644
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -1729,12 +1729,14 @@ module = { @@ -246,6 +246,7 @@ kernel = {
arm64_efi = kern/arm64/efi/init.c;
arm64_efi = kern/efi/fdt.c;
+ arm64_efi = loader/efi/fdt.c;
i386_pc = kern/i386/pc/init.c;
i386_pc = kern/i386/pc/mmap.c;
@@ -1729,12 +1730,14 @@ module = {
efi = loader/efi/linux.c; efi = loader/efi/linux.c;
}; };