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

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

diff --git a/include/asm-sparc/global_data.h b/include/asm-sparc/global_data.h
index a8d85f1b5c5920c7d428d1ba87243d7ca889804f..dea2857274c80cc9fa5fb360bfe907abdb819bcd 100644 (file)
--- a/include/asm-sparc/global_data.h
+++ b/include/asm-sparc/global_data.h
@@ -36,7 +36,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 CFG_GBL_DATA_SIZE > sizeof(gd_t)
+ * Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
  */
 
 typedef struct global_data {
@@ -82,6 +82,7 @@ typedef struct global_data {
 #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 DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("%g7")