We want to unify the global_data structure. Most fields are common across
architectures, but there are a fair number of SOC-specific additions. It
isn't clear how best to deal with these, but for now we just use #ifdef.

Checkpatch warnings here might be unavoidable:

warning: include/asm-generic/global_data.h,43: do not add new typedefs
warning: include/asm-generic/global_data.h,117: Use of volatile is usually 
wrong: see Documentation/volatile-considered-harmful.txt
warning: include/asm-generic/global_data.h,121: storage class should be at the 
beginning of the declaration

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

 include/asm-generic/global_data.h |  115 +++++++++++++++++++++++++++++++++++++
 1 files changed, 115 insertions(+), 0 deletions(-)
 create mode 100644 include/asm-generic/global_data.h

diff --git a/include/asm-generic/global_data.h 
b/include/asm-generic/global_data.h
new file mode 100644
index 0000000..6199926
--- /dev/null
+++ b/include/asm-generic/global_data.h
@@ -0,0 +1,115 @@
+/*
+ * (C) Copyright 2002-2010
+ * Wolfgang Denk, DENX Software Engineering, w...@denx.de.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef        __ASM_GENERIC_GBL_DATA_H
+#define __ASM_GENERIC_GBL_DATA_H
+/*
+ * The following data structure is placed in some memory which 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)
+ *
+ * s...@chromium.org: Well it would be nice to have a generic one of these
+ * since so many fields are similar. But it means that everyone architecture
+ * will want to add its own nutty fields. Perhaps that is no bad thing since
+ * it shows up inconsistences and might produce downward pressure on the
+ * number of fields.
+ */
+
+#ifndef __ASSEMBLY__
+typedef struct global_data {
+       bd_t            *bd;
+       unsigned long   flags;
+       unsigned long   baudrate;
+#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
+       unsigned long   fb_base;        /* Base address of framebuffer mem */
+#endif
+#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
+       unsigned long   post_log_word;  /* Record POST activities */
+       unsigned long   post_log_res; /* success of POST test */
+       unsigned long   post_init_f_time;  /* When post_init_f started */
+#endif
+       unsigned long   have_console;   /* serial_init() was called */
+#ifdef CONFIG_PRE_CONSOLE_BUFFER
+       unsigned long   precon_buf_idx; /* Pre-Console buffer index */
+#endif
+       unsigned long   env_addr;       /* Address  of Environment struct */
+       unsigned long   env_valid;      /* Checksum of Environment valid? */
+       /* Here begins ARM-specific things. Needs discussion */
+#ifdef CONFIG_AT91FAMILY
+       /* "static data" needed by at91's clock.c */
+       unsigned long   cpu_clk_rate_hz;
+       unsigned long   main_clk_rate_hz;
+       unsigned long   mck_rate_hz;
+       unsigned long   plla_rate_hz;
+       unsigned long   pllb_rate_hz;
+       unsigned long   at91_pllb_usb_init;
+#endif
+#ifdef CONFIG_ARM
+       /* "static data" needed by most of timer.c on ARM platforms */
+       unsigned long   timer_rate_hz;
+       unsigned long   tbl;
+       unsigned long   tbu;
+       unsigned long long      timer_reset_value;
+       unsigned long   lastinc;
+#endif
+#ifdef CONFIG_IXP425
+       unsigned long   timestamp;
+#endif
+       /* TODO: is this the same as relocaddr, or something else? */
+       unsigned long   dest_addr;      /* Post-relocation address of U-Boot */
+       unsigned long   dest_addr_sp;
+       unsigned long   ram_top;        /* Top address of RAM used by U-Boot */
+
+       unsigned long   relocaddr;      /* Start address of U-Boot in RAM */
+       phys_size_t     ram_size;       /* RAM size */
+       unsigned long   mon_len;        /* monitor len */
+       unsigned long   irq_sp;         /* irq stack pointer */
+       unsigned long   start_addr_sp;  /* start_addr_stackpointer */
+       unsigned long   reloc_off;
+#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
+       unsigned long   tlb_addr;
+#endif
+       struct global_data *new_gd;     /* relocated 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. */
+} gd_t;
+#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 /* Env. imported into hash table   */
+
+#endif /* __ASM_GENERIC_GBL_DATA_H */
-- 
1.7.7.3

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to