Add architecture-specific global data

[platform/kernel/u-boot.git] / arch / avr32 / include / asm / global_data.h

diff --git a/arch/avr32/include/asm/global_data.h b/arch/avr32/include/asm/global_data.h
index efbdda9..236a9da 100644 (file)
--- a/arch/avr32/include/asm/global_data.h
+++ b/arch/avr32/include/asm/global_data.h
@@ -22,22 +22,27 @@
 #ifndef __ASM_GLOBAL_DATA_H__
 #define __ASM_GLOBAL_DATA_H__
 
+/* Architecture-specific global data */
+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).
- *
- * Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
  */
 
 typedef        struct  global_data {
        bd_t            *bd;
        unsigned long   flags;
-       unsigned long   baudrate;
+       unsigned int    baudrate;
        unsigned long   stack_end;      /* highest stack address */
        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   reloc_off;      /* Relocation Offset */
        unsigned long   env_addr;       /* Address of env struct */
        unsigned long   env_valid;      /* Checksum of env valid? */
@@ -46,18 +51,11 @@ typedef     struct  global_data {
        void            *fb_base;       /* framebuffer address */
 #endif
        void            **jt;           /* jump table */
+       char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
-/*
- * Global Data Flags
- */
-#define GD_FLG_RELOC   0x00001         /* Code was relocated to RAM     */
-#define GD_FLG_DEVINIT 0x00002         /* Devices have been initialized */
-#define GD_FLG_SILENT  0x00004         /* Silent mode                   */
-#define GD_FLG_POSTFAIL        0x00008         /* Critical POST test failed     */
-#define GD_FLG_POSTSTOP        0x00010         /* POST seqeunce aborted         */
-#define GD_FLG_LOGINIT 0x00020         /* Log Buf has been initialized  */
-#define GD_FLG_DISABLE_CONSOLE 0x00040         /* Disable console (in & out)    */
+#include <asm-generic/global_data_flags.h>
 
 #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm("r5")