diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2018-04-26 18:21:26 +0530 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 15:53:24 -0400 |
| commit | acf1500138bb6b0496fe09d6bffdf8eac3d6ecab (patch) | |
| tree | c580714ef4651297c2236177a3fb529e25b2c9c9 /arch/arm/mach-at91 | |
| parent | 2a5180535cb7c66ed3ca98d01db82df7c936b469 (diff) | |
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-at91')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 12 | ||||
| -rw-r--r-- | arch/arm/mach-at91/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/config.mk | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 1a6ed211e5..79c84a5d7b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -45,15 +45,15 @@ config AT91SAM9X5 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_SAMA5D2_XPLAINED 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_WB45N 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 @@ source "board/laird/wb50n/Kconfig" 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 d491777709..045ac88806 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -16,4 +16,4 @@ endif 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 7168abbd58..9a023efb19 100644 --- a/arch/arm/mach-at91/config.mk +++ b/arch/arm/mach-at91/config.mk @@ -2,7 +2,7 @@ ifeq ($(CONFIG_CPU_ARM926EJS),y) 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 |