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

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

diff --git a/include/asm-arm/global_data.h b/include/asm-arm/global_data.h
index b3c7084352eae61beb8cabd4a79952d11176aaa9..8115a24b78bba0f54ec1adc056bd8b1a83cb9753 100644 (file)
--- a/include/asm-arm/global_data.h
+++ b/include/asm-arm/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 {
@@ -38,7 +38,6 @@ typedef       struct  global_data {
        unsigned long   flags;
        unsigned long   baudrate;
        unsigned long   have_console;   /* serial_init() was called */
-       unsigned long   reloc_off;      /* Relocation Offset */
        unsigned long   env_addr;       /* Address  of Environment struct */
        unsigned long   env_valid;      /* Checksum of Environment valid? */
        unsigned long   fb_base;        /* base address of frame buffer */
@@ -48,7 +47,7 @@ typedef       struct  global_data {
 #if 0
        unsigned long   cpu_clk;        /* CPU clock in Hz!             */
        unsigned long   bus_clk;
-       unsigned long   ram_size;       /* RAM size */
+       phys_size_t     ram_size;       /* RAM size */
        unsigned long   reset_status;   /* reset status register at boot */
 #endif
        void            **jt;           /* jump table */
@@ -60,12 +59,11 @@ 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 GCC_4_SCREW_GDP 1
-#ifdef GCC_4_SCREW_GDP
-# define DECLARE_GLOBAL_DATA_PTR     register gd_t* volatile gd asm ("r8");
-#else
-# define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r8")
-#endif
+#define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r8")
 
 #endif /* __ASM_GBL_DATA_H */