mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-28 07:03:31 +08:00
treewide: include libfdt_env.h before fdt.h
and, if including libfdt.h which includes libfdt_env.h in the correct order, don't include fdt.h before libfdt.h. this is needed to get the fdt type definitions set from the project environment before fdt.h uses them. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Jerry Van Baren <gvb.uboot@gmail.com>
This commit is contained in:
parent
6487d88aaa
commit
12e06fe03f
@ -30,7 +30,6 @@
|
||||
#include <image.h>
|
||||
#include <u-boot/zlib.h>
|
||||
#include <asm/byteorder.h>
|
||||
#include <fdt.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
#include <asm/bootm.h>
|
||||
|
@ -36,7 +36,6 @@
|
||||
#include <asm/mp.h>
|
||||
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
#include <fdt.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
|
@ -32,6 +32,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <compiler.h>
|
||||
#include <libfdt_env.h>
|
||||
#include <fdt.h>
|
||||
#include <asm/arch/tables.h>
|
||||
|
||||
|
@ -47,7 +47,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
#include <fdt.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
#endif
|
||||
|
@ -29,7 +29,6 @@
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/types.h>
|
||||
#include <asm/global_data.h>
|
||||
#include <fdt.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/types.h>
|
||||
#include <asm/global_data.h>
|
||||
#include <fdt.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
#include <exports.h>
|
||||
|
@ -47,7 +47,6 @@
|
||||
#include <image.h>
|
||||
|
||||
#if defined(CONFIG_FIT) || defined(CONFIG_OF_LIBFDT)
|
||||
#include <fdt.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
#endif
|
||||
|
@ -26,6 +26,7 @@
|
||||
|
||||
#ifdef CONFIG_OF_LIBFDT
|
||||
|
||||
#include <libfdt_env.h>
|
||||
#include <fdt.h>
|
||||
|
||||
u32 fdt_getprop_u32_default(const void *fdt, const char *path,
|
||||
|
@ -52,7 +52,6 @@
|
||||
#endif /* USE_HOSTCC */
|
||||
|
||||
#if defined(CONFIG_FIT)
|
||||
#include <fdt.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
#define CONFIG_MD5 /* FIT images need MD5 support */
|
||||
|
@ -21,7 +21,6 @@
|
||||
#define __FDT_HOST_H__
|
||||
|
||||
/* Make sure to include u-boot version of libfdt include files */
|
||||
#include "../include/fdt.h"
|
||||
#include "../include/libfdt.h"
|
||||
#include "../include/fdt_support.h"
|
||||
|
||||
|
@ -38,7 +38,6 @@
|
||||
#endif
|
||||
|
||||
#include <sha1.h>
|
||||
#include <fdt.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
#include <image.h>
|
||||
|
Loading…
Reference in New Issue
Block a user