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>
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 1a6ed21..79c84a5 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -45,15 +45,15 @@
config SAMA5D2
bool
- select CPU_V7
+ select CPU_V7A
config SAMA5D3
bool
- select CPU_V7
+ select CPU_V7A
config SAMA5D4
bool
- select CPU_V7
+ select CPU_V7A
choice
prompt "Atmel AT91 board select"
@@ -159,7 +159,7 @@
config TARGET_SAMA5D27_SOM1_EK
bool "SAMA5D27 SOM1 EK board"
- select CPU_V7
+ select CPU_V7A
select SUPPORT_SPL
select BOARD_EARLY_INIT_F
select BOARD_LATE_INIT
@@ -254,7 +254,7 @@
config TARGET_WB50N
bool "Support Laird WB50N"
select BOARD_LATE_INIT
- select CPU_V7
+ select CPU_V7A
select SUPPORT_SPL
select BOARD_EARLY_INIT_F
@@ -297,6 +297,6 @@
config SPL_LDSCRIPT
default "arch/arm/mach-at91/arm926ejs/u-boot-spl.lds" if CPU_ARM926EJS
- default "arch/arm/mach-at91/armv7/u-boot-spl.lds" if CPU_V7
+ default "arch/arm/mach-at91/armv7/u-boot-spl.lds" if CPU_V7A
endif
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index d491777..045ac88 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -16,4 +16,4 @@
obj-y += clock.o
obj-$(CONFIG_CPU_ARM920T) += arm920t/
obj-$(CONFIG_CPU_ARM926EJS) += arm926ejs/
-obj-$(CONFIG_CPU_V7) += armv7/
+obj-$(CONFIG_CPU_V7A) += armv7/
diff --git a/arch/arm/mach-at91/config.mk b/arch/arm/mach-at91/config.mk
index 7168abb..9a023ef 100644
--- a/arch/arm/mach-at91/config.mk
+++ b/arch/arm/mach-at91/config.mk
@@ -2,7 +2,7 @@
PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
endif
-ifeq ($(CONFIG_CPU_V7),y)
+ifeq ($(CONFIG_CPU_V7A),y)
ifndef CONFIG_SPL_BUILD
ALL-y += u-boot.img
endif