rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / include / asm-blackfin / global_data.h

diff --git a/include/asm-blackfin/global_data.h b/include/asm-blackfin/global_data.h
index 4c8863962343225d22a480eb5018d326edbd991a..5c9903bb150228e1a0d1c963b6ddfdb61cd62a59 100644 (file)
--- a/include/asm-blackfin/global_data.h
+++ b/include/asm-blackfin/global_data.h
@@ -35,7 +35,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 {
        bd_t *bd;
@@ -43,7 +43,7 @@ typedef struct global_data {
        unsigned long board_type;
        unsigned long baudrate;
        unsigned long have_console;     /* serial_init() was called */
-       unsigned long ram_size; /* RAM size */
+       phys_size_t ram_size;           /* RAM size */
        unsigned long reloc_off;        /* Relocation Offset */
        unsigned long env_addr; /* Address  of Environment struct */
        unsigned long env_valid;        /* Checksum of Environment valid? */
@@ -64,6 +64,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 Buf has been initialized  */
+#define GD_FLG_DISABLE_CONSOLE 0x00040         /* Disable console (in & out)    */
 
 #define DECLARE_GLOBAL_DATA_PTR     register gd_t * volatile gd asm ("P5")