From: Masahiro Yamada Date: Tue, 21 Apr 2015 12:59:38 +0000 (+0900) Subject: ARM: integrator: abolish CONFIG_INTEGRATOR X-Git-Tag: v2015.07-rc1~90 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e702146ee5738c49355bce4f5c35cb080f71e6f5;p=platform%2Fkernel%2Fu-boot.git ARM: integrator: abolish CONFIG_INTEGRATOR Switch to CONFIG_ARCH_INTEGRATOR defined by Kconfig. Signed-off-by: Masahiro Yamada Cc: Linus Walleij --- diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index e20e5a8..5d864b9 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -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 */ diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 4362925..12c7382 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -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