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

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

diff --git a/include/asm-m68k/global_data.h b/include/asm-m68k/global_data.h
index 10c6931..413c200 100644 (file)
--- a/include/asm-m68k/global_data.h
+++ b/include/asm-m68k/global_data.h
@@ -30,7 +30,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 {
@@ -75,6 +75,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)    */
 
 #if 0
 extern gd_t *global_data;