ARM: integrator: abolish CONFIG_INTEGRATOR
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 21 Apr 2015 12:59:38 +0000 (21:59 +0900)
committerTom Rini <trini@konsulko.com>
Thu, 23 Apr 2015 12:52:27 +0000 (08:52 -0400)
Switch to CONFIG_ARCH_INTEGRATOR defined by Kconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
arch/arm/cpu/arm946es/cpu.c
include/configs/integrator-common.h

index e20e5a89aa407d01282d307fa8a27f720cc983f6..5d864b901298e3b76da335676521f3846bf88002 100644 (file)
@@ -53,7 +53,7 @@ static void cache_flush (void)
        asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (i));
 }
 
-#ifndef CONFIG_INTEGRATOR
+#ifndef CONFIG_ARCH_INTEGRATOR
 
 __attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused)))
 {
@@ -63,4 +63,4 @@ __attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused)))
                ;
 }
 
-#endif /* #ifdef CONFIG_INTEGRATOR */
+#endif /* #ifdef CONFIG_ARCH_INTEGRATOR */
index 4362925ae1e11924563b620973e32f414eec275b..12c7382c17f57ab08c9da29a362fc8e39c9c4aed 100644 (file)
@@ -7,8 +7,6 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#define CONFIG_INTEGRATOR
-
 #define CONFIG_SYS_TEXT_BASE           0x01000000
 #define CONFIG_SYS_MEMTEST_START       0x100000
 #define CONFIG_SYS_MEMTEST_END         0x10000000