rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the FDT workaround so non-arm builds.

Browse Source 
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-08-02 14:54:16 -04:00
parent 18694c1a36
commit 9763257b7e
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0227-Rework-how-the-fdt-command-builds.patch
View File

@ -17,8 +17,9 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
grub-core/Makefile.core.def | 5 ++---
grub-core/lib/fdt.c | 2 --
grub-core/loader/efi/fdt.c | 2 ++
include/grub/fdt.h | 4 ++++
grub-core/Makefile.am | 1 +
4 files changed, 5 insertions(+), 5 deletions(-)
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 715d3a3ec02..203584fb00b 100644
@ -83,6 +84,26 @@ index a4c6e803645..a9dbcfdfeaf 100644
static void *loaded_fdt;
static void *fdt;
diff --git a/include/grub/fdt.h b/include/grub/fdt.h
index 158b1bc4b3a..6ee57e11ab3 100644
--- a/include/grub/fdt.h
+++ b/include/grub/fdt.h
@@ -19,6 +19,8 @@
#ifndef GRUB_FDT_HEADER
#define GRUB_FDT_HEADER 1
+#if defined(__arm__) || defined(__aarch64__)
+
#include <grub/types.h>
#include <grub/symbol.h>
@@ -141,4 +143,6 @@ int EXPORT_FUNC(grub_fdt_set_prop) (void *fdt, unsigned int nodeoffset, const ch
grub_fdt_set_prop ((fdt), (nodeoffset), "reg", reg_64, 16); \
})
+#endif /* defined(__arm__) || defined(__aarch64__) */
+
#endif /* ! GRUB_FDT_HEADER */
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 3781bb9cbb9..4062652506d 100644
--- a/grub-core/Makefile.am