diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:49:14 +0000 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-04 09:05:45 -0500 | 
| commit | baa1e53683230ee8fa8a93d1c1fd6cf96d38ce84 (patch) | |
| tree | 920b0d5b5a20bd18b8ad2e6c3e45431c80c53ceb /arch/arm/include/asm/global_data.h | |
| parent | c8fcd0f279657da4ddb3beb90058483b5b38de31 (diff) | |
| download | olio-uboot-2014.01-baa1e53683230ee8fa8a93d1c1fd6cf96d38ce84.tar.xz olio-uboot-2014.01-baa1e53683230ee8fa8a93d1c1fd6cf96d38ce84.zip | |
arm: Use generic global_data
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/include/asm/global_data.h')
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 38 | 
1 files changed, 1 insertions, 37 deletions
| diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index a3398cfc2..37ac0daa7 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -53,43 +53,7 @@ struct arch_global_data {  #endif  }; -/* - * The following data structure is placed in some memory which is - * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or - * some locked parts of the data cache) to allow for a minimum set of - * global variables during system initialization (until we have set - * up the memory controller so that we can use RAM). - */ - -typedef	struct	global_data { -	bd_t		*bd; -	unsigned long	flags; -	unsigned int	baudrate; -	unsigned long	have_console;	/* serial_init() was called */ -#ifdef CONFIG_PRE_CONSOLE_BUFFER -	unsigned long	precon_buf_idx;	/* Pre-Console buffer index */ -#endif -	unsigned long	env_addr;	/* Address  of Environment struct */ -	unsigned long	env_valid;	/* Checksum of Environment valid? */ -	unsigned long	fb_base;	/* base address of frame buffer */ -	unsigned long	relocaddr;	/* Start address of U-Boot in RAM */ -	phys_size_t	ram_size;	/* RAM size */ -	unsigned long	mon_len;	/* monitor len */ -	unsigned long	irq_sp;		/* irq stack pointer */ -	unsigned long	start_addr_sp;	/* start_addr_stackpointer */ -	unsigned long	reloc_off; -	const void	*fdt_blob;	/* Our device tree, NULL if none */ -	void		**jt;		/* jump table */ -	char		env_buf[32];	/* buffer for getenv() before reloc. */ -#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) -	unsigned long	post_log_word; /* Record POST activities */ -	unsigned long	post_log_res; /* success of POST test */ -	unsigned long	post_init_f_time; /* When post_init_f started */ -#endif -	struct arch_global_data arch;	/* architecture-specific data */ -} gd_t; - -#include <asm-generic/global_data_flags.h> +#include <asm-generic/global_data.h>  #define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r8") |