|
@@ -1,7 +1,7 @@
|
|
|
-From b1f8b84489c96465b63485b884238b61d31ca84d Mon Sep 17 00:00:00 2001
|
|
|
+From 086283ed7f1886de05407bc75dd4c070c78a6f50 Mon Sep 17 00:00:00 2001
|
|
|
From: Lothar Felten <lothar.felten@gmail.com>
|
|
|
Date: Mon, 8 Oct 2018 13:29:44 +0200
|
|
|
-Subject: [PATCH 1/1] Fix include guards for older kernel/u-boot sources
|
|
|
+Subject: [PATCH] Fix include guards for older kernel/u-boot sources
|
|
|
|
|
|
Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt
|
|
|
include guards with leading underscores.
|
|
@@ -12,11 +12,27 @@ This patch handles both include guard types and allows the compilation
|
|
|
of older Linux kernel and u-boot sources.
|
|
|
|
|
|
Signed-off-by: Lothar Felten <lothar.felten@gmail.com>
|
|
|
+[ThomasDS: also update fdt.h which has the same issue, seen on U-Boot
|
|
|
+2011.03]
|
|
|
+Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
|
|
---
|
|
|
+ libfdt/fdt.h | 4 ++++
|
|
|
libfdt/libfdt.h | 4 ++++
|
|
|
libfdt/libfdt_env.h | 4 ++++
|
|
|
- 2 files changed, 8 insertions(+)
|
|
|
+ 3 files changed, 12 insertions(+)
|
|
|
|
|
|
+diff --git a/libfdt/fdt.h b/libfdt/fdt.h
|
|
|
+index 74961f9..2904f48 100644
|
|
|
+--- a/libfdt/fdt.h
|
|
|
++++ b/libfdt/fdt.h
|
|
|
+@@ -1,3 +1,7 @@
|
|
|
++#ifdef _FDT_H
|
|
|
++#warning "Please consider updating your kernel and/or u-boot version"
|
|
|
++#define FDT_H
|
|
|
++#endif
|
|
|
+ #ifndef FDT_H
|
|
|
+ #define FDT_H
|
|
|
+ /*
|
|
|
diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
|
|
|
index 830b77e..bef4566 100644
|
|
|
--- a/libfdt/libfdt.h
|
|
@@ -42,5 +58,5 @@ index eb20538..6a61e6a 100644
|
|
|
#define LIBFDT_ENV_H
|
|
|
/*
|
|
|
--
|
|
|
-2.11.0
|
|
|
+2.19.2
|
|
|
|