diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-26 09:37:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-26 09:37:37 -0400 |
| commit | 6f9656d726235b4cbb4f469a82c30e5006a75b53 (patch) | |
| tree | 2b8afde3d7a06a3778bd24cf4243dd0856a07add /arch/arm | |
| parent | 50b4b80f597b9f59b98adbdbad691b1027bd501a (diff) | |
| parent | 1ee774d20914fb89ad1b236aedb4178912f77c77 (diff) | |
Merge branch '2019-08-24-master-imports'
- Migrate SYS_SPI_U_BOOT_OFFS, SYS_NAND_USE_FLASH_BBT and ARCH_CPU_INIT
to Kconfig
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-lpc32xx/config.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91rm9200.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 12e9ea454e..cbb2a2a158 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -329,6 +329,12 @@ config SYS_CACHELINE_SIZE default 64 if SYS_CACHE_SHIFT_6 default 32 if SYS_CACHE_SHIFT_5 +config ARCH_CPU_INIT + bool "Enable ARCH_CPU_INIT" + help + Some architectures require a call to arch_cpu_init() + Say Y here to enable it + config SYS_ARCH_TIMER bool "ARM Generic Timer support" depends on CPU_V7A || ARM64 diff --git a/arch/arm/include/asm/arch-lpc32xx/config.h b/arch/arm/include/asm/arch-lpc32xx/config.h index 471a336f13..0836091af2 100644 --- a/arch/arm/include/asm/arch-lpc32xx/config.h +++ b/arch/arm/include/asm/arch-lpc32xx/config.h @@ -10,7 +10,6 @@ /* Basic CPU architecture */ -#define CONFIG_ARCH_CPU_INIT /* UART configuration */ #if (CONFIG_SYS_LPC32XX_UART == 1) || (CONFIG_SYS_LPC32XX_UART == 2) || \ diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h index d45343b4d3..3412df0f06 100644 --- a/arch/arm/mach-at91/include/mach/at91rm9200.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200.h @@ -5,7 +5,6 @@ #ifndef __AT91RM9200_H__ #define __AT91RM9200_H__ -#define CONFIG_ARCH_CPU_INIT /* we need arch_cpu_init() for hw timers */ #define CONFIG_AT91_GPIO /* and require always gpio features */ /* Periperial Identifiers */ |