Merge tag 'xilinx-for-v2017.09' of git://www.denx.de/git/u-boot-microblaze

[oweals/u-boot.git] / 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 dfcbcceba3bd849ab6d1ace17fced5b2583cfd6b..3cc0e5fa34a5a762f29e01abf6e04db4dab685e0 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -32,8 +32,8 @@ struct arch_global_data {
 #endif
        /* "static data" needed by most of timer.c on ARM platforms */
        unsigned long timer_rate_hz;
-       unsigned long tbu;
-       unsigned long tbl;
+       unsigned int tbu;
+       unsigned int tbl;
        unsigned long lastinc;
        unsigned long long timer_reset_value;
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
@@ -67,7 +67,7 @@ struct arch_global_data {
        phys_addr_t resv_ram;
 #endif
 
-#ifdef CONFIG_ARCH_OMAP2
+#ifdef CONFIG_ARCH_OMAP2PLUS
        u32 omap_boot_device;
        u32 omap_boot_mode;
        u8 omap_ch_flags;