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

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

diff --git a/include/asm-sh/global_data.h b/include/asm-sh/global_data.h
index 0a44a34cef4a4d50b5239af9eea34f307bdca2c2..c12b8558ecbd7a2fc6a335762f14f31ebd1973a7 100644 (file)
--- a/include/asm-sh/global_data.h
+++ b/include/asm-sh/global_data.h
@@ -34,8 +34,7 @@ typedef       struct global_data
        unsigned long   baudrate;
        unsigned long   cpu_clk;        /* CPU clock in Hz! */
        unsigned long   have_console;   /* serial_init() was called */
-       unsigned long   ram_size;       /* RAM size */
-       unsigned long   reloc_off;      /* Relocation Offset */
+       phys_size_t     ram_size;       /* RAM size */
        unsigned long   env_addr;       /* Address  of Environment struct */
        unsigned long   env_valid;      /* Checksum of Environment valid */
        void            **jt;           /* Standalone app jump table */
@@ -44,6 +43,10 @@ typedef      struct global_data
 #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 DECLARE_GLOBAL_DATA_PTR        register gd_t *gd asm ("r13")