From acf1500138bb6b0496fe09d6bffdf8eac3d6ecab Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Thu, 26 Apr 2018 18:21:26 +0530 Subject: arm: v7: Kconfig: Rename CPU_V7 as CPU_V7A Currently CPU_V7 kconfig symbol supports only ARMv7A architectures under armv7 folder. This led to a misconception of creating separate folders for armv7m and armv7r. There is no reason to create separate folder for other armv7 based architectures when it can co-exist with few Kconfig symbols. As a first step towards a common folder, rename CPU_V7 as CPUV7A. Later separate Kconfig symbols can be added for CPU_V7R and CPU_V7M and can co exist in the same folder. Reviewed-by: Tom Rini Tested-by: Michal Simek Suggested-by: Alexander Graf Signed-off-by: Lokesh Vutla --- arch/arm/mach-exynos/Kconfig | 4 ++-- arch/arm/mach-exynos/Makefile | 2 +- arch/arm/mach-exynos/soc.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'arch/arm/mach-exynos') diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 5ac047d8922..65d9168ae2f 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -6,7 +6,7 @@ choice config ARCH_EXYNOS4 bool "Exynos4 SoC family" - select CPU_V7 + select CPU_V7A select BOARD_EARLY_INIT_F help Samsung Exynos4 SoC family are based on ARM Cortex-A9 CPU. There @@ -15,7 +15,7 @@ config ARCH_EXYNOS4 config ARCH_EXYNOS5 bool "Exynos5 SoC family" - select CPU_V7 + select CPU_V7A select BOARD_EARLY_INIT_F select SHA_HW_ACCEL imply CRC32_VERIFY diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index f476a8d7b57..e895c13157f 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -4,7 +4,7 @@ # Minkyu Kang obj-y += soc.o -obj-$(CONFIG_CPU_V7) += clock.o pinmux.o power.o system.o +obj-$(CONFIG_CPU_V7A) += clock.o pinmux.o power.o system.o obj-$(CONFIG_ARM64) += mmu-arm64.o obj-$(CONFIG_EXYNOS5420) += sec_boot.o diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c index 0ef7ad3314b..589e16c5ad6 100644 --- a/arch/arm/mach-exynos/soc.c +++ b/arch/arm/mach-exynos/soc.c @@ -20,7 +20,7 @@ void *secondary_boot_addr = (void *)_main; void reset_cpu(ulong addr) { -#ifdef CONFIG_CPU_V7 +#ifdef CONFIG_CPU_V7A writel(0x1, samsung_get_base_swreset()); #endif } -- cgit v1.2.3