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

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

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 5438ebc5fb74c2e8fc442575844131e5df4d17c7..ef9959e6eefc53144707026f2e4c7df7bdd3a5f5 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -41,9 +41,6 @@ typedef       struct  global_data {
        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 */
-#ifdef CONFIG_VFD
-       unsigned char   vfd_type;       /* display type */
-#endif
 #ifdef CONFIG_FSL_ESDHC
        unsigned long   sdhc_clk;
 #endif
@@ -55,13 +52,18 @@ typedef     struct  global_data {
        unsigned long   plla_rate_hz;
        unsigned long   pllb_rate_hz;
        unsigned long   at91_pllb_usb_init;
-       /* "static data" needed by at91's timer.c */
+#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
-#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
        unsigned long   relocaddr;      /* Start address of U-Boot in RAM */
        phys_size_t     ram_size;       /* RAM size */
        unsigned long   mon_len;        /* monitor len */
@@ -70,7 +72,6 @@ typedef       struct  global_data {
        unsigned long   reloc_off;
 #if !(defined(CONFIG_SYS_NO_ICACHE) && defined(CONFIG_SYS_NO_DCACHE))
        unsigned long   tlb_addr;
-#endif
 #endif
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */