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

[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 b85b7fe808f53a0590fb8160e61ff0a91386c6b9..c3ff789999a1b129e8ad42237e1031f052ace67d 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -76,8 +76,14 @@ typedef      struct  global_data {
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
        unsigned long   tlb_addr;
 #endif
+       const void      *fdt_blob;      /* Our device tree, NULL if none */
        void            **jt;           /* jump table */
        char            env_buf[32];    /* buffer for getenv() before reloc. */
+#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
 } gd_t;
 
 /*