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

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

diff --git a/include/asm-arm/global_data.h b/include/asm-arm/global_data.h
index e0a95e081b4dc2f4a18061b1fb78dbe2cf0c3955..7564ff1469fdbdd3a19ffb5cbc31b7d01a894d4a 100644 (file)
--- a/include/asm-arm/global_data.h
+++ b/include/asm-arm/global_data.h
@@ -41,10 +41,9 @@ typedef      struct  global_data {
        unsigned long   reloc_off;      /* Relocation Offset */
        unsigned long   env_addr;       /* Address  of Environment struct */
        unsigned long   env_valid;      /* Checksum of Environment valid? */
-#ifdef CONFIG_VFD
        unsigned long   fb_base;        /* base address of frame buffer */
+#ifdef CONFIG_VFD
        unsigned char   vfd_type;       /* display type */
-       unsigned char   vfd_inv_data;   /* inverted data lines ? */
 #endif
 #if 0
        unsigned long   cpu_clk;        /* CPU clock in Hz!             */
@@ -52,6 +51,7 @@ typedef       struct  global_data {
        unsigned long   ram_size;       /* RAM size */
        unsigned long   reset_status;   /* reset status register at boot */
 #endif
+       void            **jt;           /* jump table */
 } gd_t;
 
 /*
@@ -59,7 +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 DECLARE_GLOBAL_DATA_PTR     register gd_t *gd asm ("r8")
+#define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r8")
 
 #endif /* __ASM_GBL_DATA_H */