1*4882a593SmuzhiyunFrom 086283ed7f1886de05407bc75dd4c070c78a6f50 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Lothar Felten <lothar.felten@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 8 Oct 2018 13:29:44 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Fix include guards for older kernel/u-boot sources 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunLinux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt 7*4882a593Smuzhiyuninclude guards with leading underscores. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThose have been removed in dtc-1.4.7. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunThis patch handles both include guard types and allows the compilation 12*4882a593Smuzhiyunof older Linux kernel and u-boot sources. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Lothar Felten <lothar.felten@gmail.com> 15*4882a593Smuzhiyun[ThomasDS: also update fdt.h which has the same issue, seen on U-Boot 16*4882a593Smuzhiyun2011.03] 17*4882a593SmuzhiyunSigned-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> 18*4882a593Smuzhiyun[SB: Updated to match context change in v1.5.1] 19*4882a593SmuzhiyunSigned-off-by: Sam Bobroff <sbobroff@linux.ibm.com> 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun libfdt/fdt.h | 4 ++++ 22*4882a593Smuzhiyun libfdt/libfdt.h | 4 ++++ 23*4882a593Smuzhiyun libfdt/libfdt_env.h | 4 ++++ 24*4882a593Smuzhiyun 3 files changed, 12 insertions(+) 25*4882a593Smuzhiyun 26*4882a593Smuzhiyundiff --git a/libfdt/fdt.h b/libfdt/fdt.h 27*4882a593Smuzhiyunindex f2e6880..0f1dc4d 100644 28*4882a593Smuzhiyun--- a/libfdt/fdt.h 29*4882a593Smuzhiyun+++ b/libfdt/fdt.h 30*4882a593Smuzhiyun@@ -1,4 +1,8 @@ 31*4882a593Smuzhiyun /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ 32*4882a593Smuzhiyun+#ifdef _FDT_H 33*4882a593Smuzhiyun+#warning "Please consider updating your kernel and/or u-boot version" 34*4882a593Smuzhiyun+#define FDT_H 35*4882a593Smuzhiyun+#endif 36*4882a593Smuzhiyun #ifndef FDT_H 37*4882a593Smuzhiyun #define FDT_H 38*4882a593Smuzhiyun /* 39*4882a593Smuzhiyundiff --git a/libfdt/libfdt.h b/libfdt/libfdt.h 40*4882a593Smuzhiyunindex 8037f39..7668432 100644 41*4882a593Smuzhiyun--- a/libfdt/libfdt.h 42*4882a593Smuzhiyun+++ b/libfdt/libfdt.h 43*4882a593Smuzhiyun@@ -1,4 +1,8 @@ 44*4882a593Smuzhiyun /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ 45*4882a593Smuzhiyun+#ifdef _LIBFDT_H 46*4882a593Smuzhiyun+#warning "Please consider updating your kernel and/or u-boot version" 47*4882a593Smuzhiyun+#define LIBFDT_H 48*4882a593Smuzhiyun+#endif 49*4882a593Smuzhiyun #ifndef LIBFDT_H 50*4882a593Smuzhiyun #define LIBFDT_H 51*4882a593Smuzhiyun /* 52*4882a593Smuzhiyundiff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h 53*4882a593Smuzhiyunindex 73b6d40..b95a287 100644 54*4882a593Smuzhiyun--- a/libfdt/libfdt_env.h 55*4882a593Smuzhiyun+++ b/libfdt/libfdt_env.h 56*4882a593Smuzhiyun@@ -1,4 +1,8 @@ 57*4882a593Smuzhiyun /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ 58*4882a593Smuzhiyun+#ifdef _LIBFDT_ENV_H 59*4882a593Smuzhiyun+#warning "Please consider updating your kernel and/or u-boot version" 60*4882a593Smuzhiyun+#define LIBFDT_ENV_H 61*4882a593Smuzhiyun+#endif 62*4882a593Smuzhiyun #ifndef LIBFDT_ENV_H 63*4882a593Smuzhiyun #define LIBFDT_ENV_H 64*4882a593Smuzhiyun /* 65*4882a593Smuzhiyun-- 66*4882a593Smuzhiyun2.22.0.216.g00a2a96fc9 67*4882a593Smuzhiyun 68