summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:49:21 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:05:46 -0500
commit1f7559ec386ef4139b2d82be9670f83dd1d0c25e (patch)
tree3e0499671d7f84246ce8882d32e0162d58f2e574
parentee22c1a21489fbf742d31ce4a1de4f2815b4354c (diff)
downloadu-boot-imx-1f7559ec386ef4139b2d82be9670f83dd1d0c25e.zip
u-boot-imx-1f7559ec386ef4139b2d82be9670f83dd1d0c25e.tar.gz
u-boot-imx-1f7559ec386ef4139b2d82be9670f83dd1d0c25e.tar.bz2
nios2: Use generic global_data
Move nios2 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Thomas Chou <thomas@wytron.com.tw>
-rw-r--r--arch/nios2/include/asm/global_data.h24
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h
index cf8597b..39c5700 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 <asm-generic/global_data_flags.h>
+#include <asm-generic/global_data.h>
#define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("gp")