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

[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 bb24f33d0d8816c089ba344d332ae40ed8c7002b..77d2653e27a1002a7afcccaf4513d987570294b4 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -8,10 +8,6 @@
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
 
-#ifdef CONFIG_OMAP
-#include <asm/omap_boot.h>
-#endif
-
 /* Architecture-specific global data */
 struct arch_global_data {
 #if defined(CONFIG_FSL_ESDHC)
@@ -43,12 +39,18 @@ struct arch_global_data {
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
        unsigned long tlb_addr;
        unsigned long tlb_size;
+#if defined(CONFIG_ARM64)
+       unsigned long tlb_fillptr;
+       unsigned long tlb_emerg;
+#endif
 #endif
 
-#ifdef CONFIG_OMAP
-       struct omap_boot_parameters omap_boot_params;
+#ifdef CONFIG_OMAP_COMMON
+       u32 omap_boot_device;
+       u32 omap_boot_mode;
+       u8 omap_ch_flags;
 #endif
-#ifdef CONFIG_FSL_LSCH3
+#if defined(CONFIG_FSL_LSCH3) && defined(CONFIG_SYS_FSL_HAS_DP_DDR)
        unsigned long mem2_clk;
 #endif
 };