From: Simon Glass Date: Thu, 13 Dec 2012 20:49:18 +0000 (+0000) Subject: microblaze: Use generic global_data X-Git-Tag: v2013.04-rc1~85 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eef5415036a7e14bcfa01f63ae0f3da4b21c69e6;p=oweals%2Fu-boot.git microblaze: Use generic global_data Move microblaze over to use generic global_data. Signed-off-by: Simon Glass Tested-by: Michal Simek --- diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h index 025131c32a..89dcef7c7e 100644 --- a/arch/microblaze/include/asm/global_data.h +++ b/arch/microblaze/include/asm/global_data.h @@ -29,32 +29,7 @@ struct arch_global_data { }; -/* - * 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 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 */ - const void *fdt_blob; /* Our device tree, NULL if none */ - unsigned long env_valid; /* Checksum of Environment valid? */ - unsigned long fb_base; /* base address of frame buffer */ - 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 ("r31")