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

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

diff --git a/arch/sandbox/include/asm/global_data.h b/arch/sandbox/include/asm/global_data.h
index 01a706362e6a53df8d39c06d6c6b3cfae2c8eaa4..3bedf77c5cbed56a291e50683865ad9f32c0c8d5 100644 (file)
--- a/arch/sandbox/include/asm/global_data.h
+++ b/arch/sandbox/include/asm/global_data.h
@@ -25,42 +25,13 @@
 
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
-/*
- * The following data structure is placed in some memory wich is
- * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
- * 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)
- */
 
-typedef        struct global_data {
-       bd_t            *bd;
-       unsigned long   flags;
-       unsigned long   baudrate;
-       unsigned long   have_console;   /* serial_init() was called */
-       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 */
+/* Architecture-specific global data */
+struct arch_global_data {
        u8              *ram_buf;       /* emulated RAM buffer */
-       phys_size_t     ram_size;       /* RAM size */
-       const void      *fdt_blob;      /* Our device tree, NULL if none */
-       void            **jt;           /* jump table */
-       char            env_buf[32];    /* buffer for getenv() before reloc. */
-} gd_t;
+};
 
-/*
- * 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 /* Env. imported into hash table */
+#include <asm-generic/global_data.h>
 
 #define DECLARE_GLOBAL_DATA_PTR     extern gd_t *gd