dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-07 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

ARM: integrator: abolish CONFIG_INTEGRATOR

Browse Source 
Switch to CONFIG_ARCH_INTEGRATOR defined by Kconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Masahiro Yamada
2015-04-21 21:59:38 +09:00
committed by Tom Rini
parent 9ef851f890
commit e702146ee5
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/arm946es/cpu.c
View File

@@ -53,7 +53,7 @@ static void cache_flush (void)
asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (i)); 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))) __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 */

2
include/configs/integrator-common.h
View File

@@ -7,8 +7,6 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#define CONFIG_INTEGRATOR
#define CONFIG_SYS_TEXT_BASE 0x01000000 #define CONFIG_SYS_TEXT_BASE 0x01000000
#define CONFIG_SYS_MEMTEST_START 0x100000 #define CONFIG_SYS_MEMTEST_START 0x100000
#define CONFIG_SYS_MEMTEST_END 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10000000