Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group

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

diff --git a/include/asm-nios/global_data.h b/include/asm-nios/global_data.h
index 75dd3fca551b3f9e6354c33451873e4184b27585..fd1138920c7507cea4e8502d4c5de3380938b084 100644 (file)
--- a/include/asm-nios/global_data.h
+++ b/include/asm-nios/global_data.h
@@ -34,12 +34,17 @@ typedef     struct  global_data {
        unsigned long   reloc_off;      /* Relocation Offset */
        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_init_f_time; /* When post_init_f started */
+#endif
        void            **jt;           /* Standalone app jump table */
 } gd_t;
 
 /* 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 DECLARE_GLOBAL_DATA_PTR     register gd_t *gd asm ("%g7")