The libfdt.h file is the definition file for libfdt. It is unnecessary to include other fdt header files (the necessary ones are pulled in by libfdt.h).

Signed-off-by: Gerald Van Baren gvb@unssw.com ---

This comes from discussion on the Device Tree email list that <libfdt.h> is *the* user interface definition.

FWIIW, I proposed removing the redundant #includes in the libfdt source too, but it hasn't been accepted by David Gibson yet. He is open to the concept but I have not pushed it forward to the point where he says "yes" or "no". I have the patch, but am holding it for when dtc/libfdt accepts it (or not).

Best regards, gvb

arch/nios2/cpu/fdt.c | 1 - arch/powerpc/cpu/mpc5xxx/cpu.c | 1 - arch/powerpc/cpu/mpc8260/cpu.c | 1 - arch/powerpc/cpu/mpc8xx/cpu.c | 1 - arch/powerpc/cpu/ppc4xx/fdt.c | 1 - arch/powerpc/lib/bootm.c | 1 - arch/x86/include/asm/arch-coreboot/sysinfo.h | 3 +-- board/cm5200/cm5200.c | 1 - include/fdt_support.h | 3 +-- 9 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c index b1ed9e1..f238665 100644 --- a/arch/nios2/cpu/fdt.c +++ b/arch/nios2/cpu/fdt.c @@ -30,7 +30,6 @@

#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c index 0c1eebd..dc021e3 100644 --- a/arch/powerpc/cpu/mpc5xxx/cpu.c +++ b/arch/powerpc/cpu/mpc5xxx/cpu.c @@ -36,7 +36,6 @@

#if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #endif

diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 220c1e2..f8bc5a9 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -50,7 +50,6 @@

#if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #endif

diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index b3fcfe5..b6b733d 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -45,7 +45,6 @@

#if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #endif

diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index 5ddb880..a94e82c 100644 --- a/arch/powerpc/cpu/ppc4xx/fdt.c +++ b/arch/powerpc/cpu/ppc4xx/fdt.c @@ -29,7 +29,6 @@

#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #include <asm/4xx_pcie.h>

diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 33d013f..0119a7b 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -38,7 +38,6 @@ #if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> #include <fdt_support.h> - #endif

#ifdef CONFIG_SYS_INIT_RAM_LOCK diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h index bd88eb5..78d3a9d 100644 --- a/arch/x86/include/asm/arch-coreboot/sysinfo.h +++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h @@ -32,8 +32,7 @@

#include <common.h> #include <compiler.h> -#include <libfdt_env.h> -#include <fdt.h> +#include <libfdt.h> #include <asm/arch/tables.h>

/* Allow a maximum of 16 memory range definitions. */ diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index b25887b..c0ea1c6 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -44,7 +44,6 @@

#ifdef CONFIG_OF_LIBFDT #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #endif /* CONFIG_OF_LIBFDT */

diff --git a/include/fdt_support.h b/include/fdt_support.h index 568bcbf..2cccc35 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -26,8 +26,7 @@

#ifdef CONFIG_OF_LIBFDT

-#include <libfdt_env.h> -#include <fdt.h> +#include <libfdt.h>

u32 fdt_getprop_u32_default(const void *fdt, const char *path, const char *prop, const u32 dflt);