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>

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>
Masahiro Yamada · Tom Rini
1 parent 9ef851f890
Showing 2 changed files with 2 additions and 4 deletions Side-by-side Diff
arch/arm/cpu/arm946es/cpu.c
include/configs/integrator-common.h
@@ -53,7 +53,7 @@
 	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,5 +63,5 @@
 		;
 }
  
-#endif	/* #ifdef CONFIG_INTEGRATOR */
+#endif	/* #ifdef CONFIG_ARCH_INTEGRATOR */
@@ -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
...	...	@@ -53,7 +53,7 @@
53	53	asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (i));
54	54	}
55	55
56		-#ifndef CONFIG_INTEGRATOR
	56	+#ifndef CONFIG_ARCH_INTEGRATOR
57	57
58	58	__attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused)))
59	59	{
...	...	@@ -63,5 +63,5 @@
63	63	;
64	64	}
65	65
66		-#endif /* #ifdef CONFIG_INTEGRATOR */
	66	+#endif /* #ifdef CONFIG_ARCH_INTEGRATOR */
...	...	@@ -7,8 +7,6 @@
7	7	* SPDX-License-Identifier: GPL-2.0+
8	8	*/
9	9
10		-#define CONFIG_INTEGRATOR
11		-
12	10	#define CONFIG_SYS_TEXT_BASE 0x01000000
13	11	#define CONFIG_SYS_MEMTEST_START 0x100000
14	12	#define CONFIG_SYS_MEMTEST_END 0x10000000