summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2018-04-26 15:51:26 +0300
committerTom Rini <trini@konsulko.com>2018-05-07 22:53:24 +0300
commitacf1500138bb6b0496fe09d6bffdf8eac3d6ecab (patch)
treec580714ef4651297c2236177a3fb529e25b2c9c9 /arch/arm/mach-exynos
parent2a5180535cb7c66ed3ca98d01db82df7c936b469 (diff)
downloadu-boot-acf1500138bb6b0496fe09d6bffdf8eac3d6ecab.tar.xz
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 <trini@konsulko.com> Tested-by: Michal Simek <michal.simek@xilinx.com> Suggested-by: Alexander Graf <agraf@suse.de> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r--arch/arm/mach-exynos/Kconfig4
-rw-r--r--arch/arm/mach-exynos/Makefile2
-rw-r--r--arch/arm/mach-exynos/soc.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 5ac047d892..65d9168ae2 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 f476a8d7b5..e895c13157 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -4,7 +4,7 @@
# Minkyu Kang <mk7.kang@samsung.com>
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 0ef7ad3314..589e16c5ad 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
}