Add architecture-specific global data

We plan to move architecture-specific data into a separate structure so
that we can make the rest of it common.

As a first step, create struct arch_global_data to hold these fields.
Initially it is empty.

This patch applies to all archs at once. I can split it if this is really
a pain.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 41a26edfb54d597d905d591a565053f8b70b0966..9fddf3b8d68d83158261157eae2d8c0d610eae68 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -23,6 +23,11 @@
 
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory which is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -83,6 +88,7 @@ typedef       struct  global_data {
        unsigned long   post_log_res; /* success of POST test */
        unsigned long   post_init_f_time; /* When post_init_f started */
 #endif
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/avr32/include/asm/global_data.h b/arch/avr32/include/asm/global_data.h
index bf661e23be93d9384f03618aa34e1e3c1a279504..236a9da5437438de0fb574b9796b3ea761efeeb9 100644 (file)
--- a/arch/avr32/include/asm/global_data.h
+++ b/arch/avr32/include/asm/global_data.h
@@ -22,6 +22,10 @@
 #ifndef __ASM_GLOBAL_DATA_H__
 #define __ASM_GLOBAL_DATA_H__
 
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -48,6 +52,7 @@ typedef       struct  global_data {
 #endif
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/blackfin/include/asm/global_data.h b/arch/blackfin/include/asm/global_data.h
index d91e5a40d314f2dd96b8cf28739bf798e7a7a30b..109069f78eb50c06a44406e10938a85873e33e06 100644 (file)
--- a/arch/blackfin/include/asm/global_data.h
+++ b/arch/blackfin/include/asm/global_data.h
@@ -30,6 +30,10 @@
 
 #include <asm/u-boot.h>
 
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -57,6 +61,7 @@ typedef struct global_data {
 
        void    **jt;                   /* jump table */
        char    env_buf[32];            /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h
index 0cdb11cf99eeccce75df5d9482c3e4a066a4b3af..fd8aacb5c8fd067f1eb2fbc42cb89db7822aee22 100644 (file)
--- a/arch/m68k/include/asm/global_data.h
+++ b/arch/m68k/include/asm/global_data.h
@@ -23,6 +23,11 @@
 
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -66,6 +71,7 @@ typedef       struct  global_data {
 #endif
        void            **jt;           /* Standalone app jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h
index 2111c7cba27fb7a1e3e65e82c1e8cd7091f774aa..025131c32abd85c8dd0d5066adcdbea4e88ae5d5 100644 (file)
--- a/arch/microblaze/include/asm/global_data.h
+++ b/arch/microblaze/include/asm/global_data.h
@@ -24,6 +24,11 @@
 
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -46,6 +51,7 @@ typedef       struct  global_data {
        unsigned long   fb_base;        /* base address of frame buffer */
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h
index a735a8a2c76d0cc3986dc705fd8f2e709d214008..99949e1d16d9fb8a63db6230cdf499f5b7737d3b 100644 (file)
--- a/arch/mips/include/asm/global_data.h
+++ b/arch/mips/include/asm/global_data.h
@@ -26,6 +26,10 @@
 
 #include <asm/regdef.h>
 
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -59,6 +63,7 @@ typedef       struct  global_data {
        unsigned long   env_valid;      /* Checksum of Environment valid? */
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/nds32/include/asm/global_data.h b/arch/nds32/include/asm/global_data.h
index b1feb2c0d0fc05558c9cb69a7ad00e3637a5d564..475bb445b5a0a10f985bbdca61d393abe8128b05 100644 (file)
--- a/arch/nds32/include/asm/global_data.h
+++ b/arch/nds32/include/asm/global_data.h
@@ -33,6 +33,11 @@
 
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -63,6 +68,7 @@ typedef       struct global_data {
 
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h
index 413b485b61bc72af1a85c2091774a6e158313dd4..cf8597b78f0de48626adfb2e935465af6b51743d 100644 (file)
--- a/arch/nios2/include/asm/global_data.h
+++ b/arch/nios2/include/asm/global_data.h
@@ -23,6 +23,10 @@
 #ifndef        __ASM_NIOS2_GLOBALDATA_H_
 #define __ASM_NIOS2_GLOBALDATA_H_
 
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 typedef        struct  global_data {
        bd_t            *bd;
        unsigned long   flags;
@@ -42,6 +46,7 @@ typedef       struct  global_data {
 #endif
        void            **jt;           /* Standalone app jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/openrisc/include/asm/global_data.h b/arch/openrisc/include/asm/global_data.h
index 96f3f1cdbbd6d27436d8555ceeb7128feab354ae..b478afa4176feaf848556f885e76c9ebe7e43214 100644 (file)
--- a/arch/openrisc/include/asm/global_data.h
+++ b/arch/openrisc/include/asm/global_data.h
@@ -24,6 +24,11 @@
 
 #ifndef __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -44,6 +49,7 @@ typedef struct global_data {
        unsigned long   fb_base;        /* base address of frame buffer */
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index cb3a80bb2bfe8c153c540130845a91871d473854..df621da701344ce7c8b9301640d6e64db146eeb1 100644 (file)
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -27,6 +27,10 @@
 #include "config.h"
 #include "asm/types.h"
 
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -184,6 +188,7 @@ typedef     struct  global_data {
 #endif
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/sandbox/include/asm/global_data.h b/arch/sandbox/include/asm/global_data.h
index 78a751d96f76bbeb28de499bdfce2ca4c8d7eda2..f33f46582567c5adcd384c294cd5085f4ed1316c 100644 (file)
--- a/arch/sandbox/include/asm/global_data.h
+++ b/arch/sandbox/include/asm/global_data.h
@@ -25,6 +25,11 @@
 
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -46,6 +51,7 @@ typedef       struct global_data {
        const void      *fdt_blob;      /* Our device tree, NULL if none */
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/sh/include/asm/global_data.h b/arch/sh/include/asm/global_data.h
index 9a2c19376daed36399086f48ff7b095b39e5aef2..db85d4dcc3c2a16fc6840e57c42d17786c2469ba 100644 (file)
--- a/arch/sh/include/asm/global_data.h
+++ b/arch/sh/include/asm/global_data.h
@@ -27,6 +27,10 @@
 #ifndef        __ASM_SH_GLOBALDATA_H_
 #define __ASM_SH_GLOBALDATA_H_
 
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 typedef        struct global_data
 {
        bd_t            *bd;
@@ -42,6 +46,7 @@ typedef       struct global_data
        unsigned long   env_valid;      /* Checksum of Environment valid */
        void            **jt;           /* Standalone app jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/sparc/include/asm/global_data.h b/arch/sparc/include/asm/global_data.h
index aa63b35cab14669d98cabd409537837b8fe510db..a51c40b41df2ff3e1c04b477f08d46829e0dd46b 100644 (file)
--- a/arch/sparc/include/asm/global_data.h
+++ b/arch/sparc/include/asm/global_data.h
@@ -29,6 +29,10 @@
 
 #include "asm/types.h"
 
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -74,6 +78,7 @@ typedef struct global_data {
 #endif
        void    **jt;                   /* jump table */
        char    env_buf[32];            /* buffer for getenv() before reloc. */
+       struct arch_global_data arch;   /* architecture-specific data */
 } gd_t;
 
 #include <asm-generic/global_data_flags.h>

diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index dc6402b67dba5425a19d526749ca0d73db35806b..39c1acfe477cca26fb668b30b38e56d6ce374e9d 100644 (file)
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -23,6 +23,13 @@
 
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+#ifndef __ASSEMBLY__
+
+/* Architecture-specific global data */
+struct arch_global_data {
+};
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -31,13 +38,12 @@
  * up the memory controller so that we can use RAM).
  */
 
-#ifndef __ASSEMBLY__
-
 #include <asm/u-boot.h>
 
 typedef struct global_data gd_t;
 
 struct global_data {
+       struct arch_global_data arch;   /* architecture-specific data */
        /* NOTE: gd_addr MUST be first member of struct global_data! */
        gd_t *gd_addr;  /* Location of Global Data */
        bd_t            *bd;