Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / 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 efbdda9ba4ca284c19596c8c3990e13062628912..4ef8fc570f34524691e59a6f03da60e2dac1fe92 100644 (file)
--- a/arch/avr32/include/asm/global_data.h
+++ b/arch/avr32/include/asm/global_data.h
@@ -29,7 +29,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 {
@@ -46,18 +46,20 @@ typedef     struct  global_data {
        void            *fb_base;       /* framebuffer address */
 #endif
        void            **jt;           /* jump table */
+       char            env_buf[32];    /* buffer for getenv() before reloc. */
 } 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)    */
+#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 *gd asm("r5")