From: Simon Glass Date: Thu, 13 Dec 2012 20:49:19 +0000 (+0000) Subject: mips: Use generic global_data X-Git-Tag: v2013.04-rc1~84 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9572202026094fb9ef5bd4dfcaa09fb7680c3855;p=u-boot mips: Use generic global_data Move mips over to use generic global_data. Signed-off-by: Simon Glass --- diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index fdd099e6f6..b39737fea3 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -35,39 +35,7 @@ struct arch_global_data { #endif }; -/* - * The following data structure is placed in some memory wich 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 long cpu_clk; /* CPU core clock */ - unsigned long sys_clk; /* System bus clock */ - unsigned long mem_clk; /* Memory bus clock */ - /* "static data" needed by most of timer.c */ - unsigned long tbl; - unsigned long lastinc; -#endif - 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 - phys_size_t ram_size; /* RAM size */ - unsigned long reloc_off; /* Relocation Offset */ - unsigned long env_addr; /* Address of Environment struct */ - unsigned long env_valid; /* Checksum of Environment valid? */ - void **jt; /* 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 volatile gd_t *gd asm ("k0")