diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-04-21 21:59:38 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-23 08:52:27 -0400 |
| commit | e702146ee5738c49355bce4f5c35cb080f71e6f5 (patch) | |
| tree | 68a5a1fccdfd2c81ed8d87eb5b6b9b3535192f04 | |
| parent | 9ef851f890c7ecb42bde06a55781b992224ef442 (diff) | |
| download | u-boot-imx-e702146ee5738c49355bce4f5c35cb080f71e6f5.zip u-boot-imx-e702146ee5738c49355bce4f5c35cb080f71e6f5.tar.gz u-boot-imx-e702146ee5738c49355bce4f5c35cb080f71e6f5.tar.bz2 | |
ARM: integrator: abolish CONFIG_INTEGRATOR
Switch to CONFIG_ARCH_INTEGRATOR defined by Kconfig.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/cpu/arm946es/cpu.c | 4 | ||||
| -rw-r--r-- | include/configs/integrator-common.h | 2 |
2 files changed, 2 insertions, 4 deletions
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 |