global_data: unify global flag defines

[pandora-u-boot.git] / arch / x86 / include / asm / global_data.h

diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 05a2139..6d29c0b 100644 (file)
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -29,13 +29,13 @@
  * some locked parts of the data cache) to allow for a minimum set of
  * 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 GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
  */
 
 #ifndef __ASSEMBLY__
 
 typedef        struct global_data {
+       /* NOTE: gd_addr MUST be first member of struct global_data! */
+       unsigned long   gd_addr;        /* Location of Global Data */
        bd_t            *bd;
        unsigned long   flags;
        unsigned long   baudrate;
@@ -51,34 +51,29 @@ typedef     struct global_data {
        unsigned long   bus_clk;
        unsigned long   relocaddr;      /* Start address of U-Boot in RAM */
        unsigned long   start_addr_sp;  /* start_addr_stackpointer */
+       unsigned long   gdt_addr;       /* Location of GDT */
+       unsigned long   new_gd_addr;    /* New location of Global Data */
        phys_size_t     ram_size;       /* RAM size */
        unsigned long   reset_status;   /* reset status register at boot */
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
 } gd_t;
 
-extern gd_t *gd;
+static inline gd_t *get_fs_gd_ptr(void)
+{
+       gd_t *gd_ptr;
+
+       asm volatile("fs movl 0, %0\n" : "=r" (gd_ptr));
+
+       return gd_ptr;
+}
+
+#define gd     get_fs_gd_ptr()
 
 #endif
 
-/*
- * Global Data Flags
- */
-#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 GD_FLG_ENV_READY       0x00080 /* Environment imported into hash table */
+#include <asm-generic/global_data_flags.h>
 
-#if 0
 #define DECLARE_GLOBAL_DATA_PTR
-#else
-#define XTRN_DECLARE_GLOBAL_DATA_PTR    extern
-#define DECLARE_GLOBAL_DATA_PTR     XTRN_DECLARE_GLOBAL_DATA_PTR \
-gd_t *gd
-#endif
 
 #endif /* __ASM_GBL_DATA_H */