Blackfin: move gd/bd to bss by default

[oweals/u-boot.git] / arch / blackfin / include / asm / global_data.h

diff --git a/arch/blackfin/include/asm/global_data.h b/arch/blackfin/include/asm/global_data.h
index 3cfd00e6655247a68fa5ed25feccc6d82d3e8d16..973ea2929a8640688bb9066dbcf02bd7c4ebdb12 100644 (file)
--- a/arch/blackfin/include/asm/global_data.h
+++ b/arch/blackfin/include/asm/global_data.h
@@ -37,7 +37,7 @@
  * 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)
+ * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
  */
 typedef struct global_data {
        bd_t *bd;
@@ -45,11 +45,15 @@ typedef struct global_data {
        unsigned long board_type;
        unsigned long 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 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
 
@@ -60,14 +64,15 @@ typedef struct global_data {
 /*
  * 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)   */
+#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 Buffer has been initialized      */
+#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out)           */
+#define GD_FLG_ENV_READY       0x00080 /* Environment imported into hash table */
 
-#define DECLARE_GLOBAL_DATA_PTR     register gd_t * volatile gd asm ("P3")
+#define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("P3")
 
 #endif