mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 02:15:45 +01: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:
		
				
					committed by
					
						 Gerald Van Baren
						Gerald Van Baren
					
				
			
			
				
	
			
			
			
						parent
						
							6487d88aaa
						
					
				
				
					commit
					12e06fe03f
				
			| @@ -30,7 +30,6 @@ | |||||||
| #include <image.h> | #include <image.h> | ||||||
| #include <u-boot/zlib.h> | #include <u-boot/zlib.h> | ||||||
| #include <asm/byteorder.h> | #include <asm/byteorder.h> | ||||||
| #include <fdt.h> |  | ||||||
| #include <libfdt.h> | #include <libfdt.h> | ||||||
| #include <fdt_support.h> | #include <fdt_support.h> | ||||||
| #include <asm/bootm.h> | #include <asm/bootm.h> | ||||||
|   | |||||||
| @@ -36,7 +36,6 @@ | |||||||
| #include <asm/mp.h> | #include <asm/mp.h> | ||||||
|  |  | ||||||
| #if defined(CONFIG_OF_LIBFDT) | #if defined(CONFIG_OF_LIBFDT) | ||||||
| #include <fdt.h> |  | ||||||
| #include <libfdt.h> | #include <libfdt.h> | ||||||
| #include <fdt_support.h> | #include <fdt_support.h> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -32,6 +32,7 @@ | |||||||
|  |  | ||||||
| #include <common.h> | #include <common.h> | ||||||
| #include <compiler.h> | #include <compiler.h> | ||||||
|  | #include <libfdt_env.h> | ||||||
| #include <fdt.h> | #include <fdt.h> | ||||||
| #include <asm/arch/tables.h> | #include <asm/arch/tables.h> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -47,7 +47,6 @@ | |||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #if defined(CONFIG_OF_LIBFDT) | #if defined(CONFIG_OF_LIBFDT) | ||||||
| #include <fdt.h> |  | ||||||
| #include <libfdt.h> | #include <libfdt.h> | ||||||
| #include <fdt_support.h> | #include <fdt_support.h> | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -29,7 +29,6 @@ | |||||||
| #include <linux/ctype.h> | #include <linux/ctype.h> | ||||||
| #include <linux/types.h> | #include <linux/types.h> | ||||||
| #include <asm/global_data.h> | #include <asm/global_data.h> | ||||||
| #include <fdt.h> |  | ||||||
| #include <libfdt.h> | #include <libfdt.h> | ||||||
| #include <fdt_support.h> | #include <fdt_support.h> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -28,7 +28,6 @@ | |||||||
| #include <linux/ctype.h> | #include <linux/ctype.h> | ||||||
| #include <linux/types.h> | #include <linux/types.h> | ||||||
| #include <asm/global_data.h> | #include <asm/global_data.h> | ||||||
| #include <fdt.h> |  | ||||||
| #include <libfdt.h> | #include <libfdt.h> | ||||||
| #include <fdt_support.h> | #include <fdt_support.h> | ||||||
| #include <exports.h> | #include <exports.h> | ||||||
|   | |||||||
| @@ -47,7 +47,6 @@ | |||||||
| #include <image.h> | #include <image.h> | ||||||
|  |  | ||||||
| #if defined(CONFIG_FIT) || defined(CONFIG_OF_LIBFDT) | #if defined(CONFIG_FIT) || defined(CONFIG_OF_LIBFDT) | ||||||
| #include <fdt.h> |  | ||||||
| #include <libfdt.h> | #include <libfdt.h> | ||||||
| #include <fdt_support.h> | #include <fdt_support.h> | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -26,6 +26,7 @@ | |||||||
|  |  | ||||||
| #ifdef CONFIG_OF_LIBFDT | #ifdef CONFIG_OF_LIBFDT | ||||||
|  |  | ||||||
|  | #include <libfdt_env.h> | ||||||
| #include <fdt.h> | #include <fdt.h> | ||||||
|  |  | ||||||
| u32 fdt_getprop_u32_default(const void *fdt, const char *path, | u32 fdt_getprop_u32_default(const void *fdt, const char *path, | ||||||
|   | |||||||
| @@ -52,7 +52,6 @@ | |||||||
| #endif /* USE_HOSTCC */ | #endif /* USE_HOSTCC */ | ||||||
|  |  | ||||||
| #if defined(CONFIG_FIT) | #if defined(CONFIG_FIT) | ||||||
| #include <fdt.h> |  | ||||||
| #include <libfdt.h> | #include <libfdt.h> | ||||||
| #include <fdt_support.h> | #include <fdt_support.h> | ||||||
| #define CONFIG_MD5		/* FIT images need MD5 support */ | #define CONFIG_MD5		/* FIT images need MD5 support */ | ||||||
|   | |||||||
| @@ -21,7 +21,6 @@ | |||||||
| #define __FDT_HOST_H__ | #define __FDT_HOST_H__ | ||||||
|  |  | ||||||
| /* Make sure to include u-boot version of libfdt include files */ | /* Make sure to include u-boot version of libfdt include files */ | ||||||
| #include "../include/fdt.h" |  | ||||||
| #include "../include/libfdt.h" | #include "../include/libfdt.h" | ||||||
| #include "../include/fdt_support.h" | #include "../include/fdt_support.h" | ||||||
|  |  | ||||||
|   | |||||||
| @@ -38,7 +38,6 @@ | |||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #include <sha1.h> | #include <sha1.h> | ||||||
| #include <fdt.h> |  | ||||||
| #include <libfdt.h> | #include <libfdt.h> | ||||||
| #include <fdt_support.h> | #include <fdt_support.h> | ||||||
| #include <image.h> | #include <image.h> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user