From: Simon Glass Date: Thu, 13 Dec 2012 20:49:21 +0000 (+0000) Subject: nios2: Use generic global_data X-Git-Tag: v2013.04-rc1~82 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f7559ec386ef4139b2d82be9670f83dd1d0c25e;p=u-boot nios2: Use generic global_data Move nios2 over to use generic global_data. Signed-off-by: Simon Glass Acked-by: Thomas Chou --- diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h index cf8597b78f..39c570023b 100644 --- a/arch/nios2/include/asm/global_data.h +++ b/arch/nios2/include/asm/global_data.h @@ -27,29 +27,7 @@ struct arch_global_data { }; -typedef struct global_data { - bd_t *bd; - unsigned long flags; - unsigned int baudrate; - unsigned long cpu_clk; /* CPU clock in Hz! */ - unsigned long have_console; /* serial_init() was called */ -#ifdef CONFIG_PRE_CONSOLE_BUFFER - unsigned long precon_buf_idx; /* Pre-Console buffer index */ -#endif - phys_size_t ram_size; /* RAM size */ - unsigned long env_addr; /* Address of Environment struct */ - unsigned long env_valid; /* Checksum of Environment valid */ -#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 - void **jt; /* Standalone app jump table */ - char env_buf[32]; /* buffer for getenv() before reloc. */ - struct arch_global_data arch; /* architecture-specific data */ -} gd_t; - -#include +#include #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("gp")