diff options
| author | Tom Rini <trini@ti.com> | 2012-12-03 06:47:05 -0700 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-03 06:47:05 -0700 | 
| commit | ce12a8c1a94a2b3d585feff387497f724b98e3ce (patch) | |
| tree | 6e5db764e27df2465f5e4d9487c7561d14050064 /arch/x86/include/asm/global_data.h | |
| parent | b04eb342af72d5dbcc29ccd7f3f9475044113361 (diff) | |
| parent | 339c5111065c2b1893af1e4d6e9431b9496879a4 (diff) | |
| download | olio-uboot-2014.01-ce12a8c1a94a2b3d585feff387497f724b98e3ce.tar.xz olio-uboot-2014.01-ce12a8c1a94a2b3d585feff387497f724b98e3ce.zip  | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/include/asm/global_data.h')
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 1 | 
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index b8961baae..35110a333 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -58,6 +58,7 @@ struct global_data {  	unsigned long	gdt_addr;	/* Location of GDT */  	phys_size_t	ram_size;	/* RAM size */  	unsigned long	reset_status;	/* reset status register at boot */ +	const void	*fdt_blob;	/* Our device tree, NULL if none */  	void		**jt;		/* jump table */  	char		env_buf[32];	/* buffer for getenv() before reloc. */  };  |