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

[u-boot] / arch / arm / config.mk

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 907c69371b944705875fc0246763fd699acbd6a4..2143633fe440985c5c732d436ee97a5b94598bc1 100644 (file)
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -6,7 +6,7 @@
 #
 
 ifndef CONFIG_STANDALONE_LOAD_ADDR
-ifneq ($(CONFIG_ARCH_OMAP2),)
+ifneq ($(CONFIG_ARCH_OMAP2PLUS),)
 CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
 else
 CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
@@ -45,7 +45,7 @@ endif
 
 # Only test once
 ifeq ($(CONFIG_$(SPL_)SYS_THUMB_BUILD),y)
-archprepare: checkthumb
+archprepare: checkthumb checkgcc6
 
 checkthumb:
        @if test "$(call cc-name)" = "gcc" -a \
@@ -55,8 +55,18 @@ checkthumb:
                echo '*** Your board is configured for THUMB mode.'; \
                false; \
        fi
+else
+archprepare: checkgcc6
 endif
 
+checkgcc6:
+       @if test "$(call cc-name)" = "gcc" -a \
+                       "$(call cc-version)" -lt "0600"; then \
+               echo -n '*** Your GCC is older than 6.0 and will not be '; \
+               echo 'supported starting in v2018.01.'; \
+       fi
+
+
 # Try if EABI is supported, else fall back to old API,
 # i. e. for example:
 # - with ELDK 4.2 (EABI supported), use: