ARM: omap2+: rename config to ARCH_OMAP2PLUS and consolidate Kconfig

[people/ms/u-boot.git] / arch / arm / include / asm / ti-common / sys_proto.h

diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h
index d3ab75fa3209024d0dd16ff00638aaeaa3f3db3c..a04750106730fa2706af83ac9edbc8df3ab23099 100644 (file)
--- a/arch/arm/include/asm/ti-common/sys_proto.h
+++ b/arch/arm/include/asm/ti-common/sys_proto.h
@@ -9,7 +9,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_OMAP_COMMON
+#ifdef CONFIG_ARCH_OMAP2PLUS
 #define TI_ARMV7_DRAM_ADDR_SPACE_START 0x80000000
 #define TI_ARMV7_DRAM_ADDR_SPACE_END   0xFFFFFFFF
 
@@ -36,7 +36,7 @@ static inline u8 uboot_loaded_by_spl(void)
         * variable by both SPL and u-boot.Check out for CHSETTINGS, which is a
         * mandatory section if CH is present.
         */
-       if ((gd->arch.omap_boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS))
+       if (gd->arch.omap_ch_flags & CH_FLAGS_CHSETTINGS)
                return 0;
        else
                return running_from_sdram();