This commit adds "select CPU_V7" for some new boards that were not covered by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).

Redundant "SYS_CPU" defines and "string" directives should be removed.

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Acked-by: Stefan Roese sr@denx.de Acked-by: Georges Savoundararadj savoundg@gmail.com ---

Changes in v2: - Rebase on commit 11ada9225a16ed2d8ddbf0715a2416245a777cbc - Fix Kosagi Novena board

arch/arm/Kconfig | 3 +++ arch/arm/cpu/armv7/tegra-common/Kconfig | 4 ---- board/Marvell/db-mv784mp-gp/Kconfig | 8 -------- board/kosagi/novena/Kconfig | 3 --- board/maxbcm/Kconfig | 7 ------- board/ti/ks2_evm/Kconfig | 3 --- 6 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f9f52e5..d3b80ba 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -225,9 +225,11 @@ config KIRKWOOD

config TARGET_DB_MV784MP_GP bool "Support db-mv784mp-gp" + select CPU_V7

config TARGET_MAXBCM bool "Support maxbcm" + select CPU_V7

config TARGET_DEVKIT3250 bool "Support devkit3250" @@ -629,6 +631,7 @@ config TARGET_HUMMINGBOARD

config TARGET_KOSAGI_NOVENA bool "Support Kosagi Novena" + select CPU_V7

config TARGET_TQMA6 bool "TQ Systems TQMa6 board" diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig index 3ea6d76..1446452 100644 --- a/arch/arm/cpu/armv7/tegra-common/Kconfig +++ b/arch/arm/cpu/armv7/tegra-common/Kconfig @@ -20,10 +20,6 @@ endchoice config USE_PRIVATE_LIBGCC default y if SPL_BUILD

-config SYS_CPU - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - source "arch/arm/cpu/armv7/tegra20/Kconfig" source "arch/arm/cpu/armv7/tegra30/Kconfig" source "arch/arm/cpu/armv7/tegra114/Kconfig" diff --git a/board/Marvell/db-mv784mp-gp/Kconfig b/board/Marvell/db-mv784mp-gp/Kconfig index f94a444..98aa10a 100644 --- a/board/Marvell/db-mv784mp-gp/Kconfig +++ b/board/Marvell/db-mv784mp-gp/Kconfig @@ -1,23 +1,15 @@ if TARGET_DB_MV784MP_GP

-config SYS_CPU - string - default "armv7" - config SYS_BOARD - string default "db-mv784mp-gp"

config SYS_VENDOR - string default "Marvell"

config SYS_SOC - string default "armada-xp"

config SYS_CONFIG_NAME - string default "db-mv784mp-gp"

endif diff --git a/board/kosagi/novena/Kconfig b/board/kosagi/novena/Kconfig index 4ba6399..94f1754 100644 --- a/board/kosagi/novena/Kconfig +++ b/board/kosagi/novena/Kconfig @@ -1,8 +1,5 @@ if TARGET_KOSAGI_NOVENA

-config SYS_CPU - default "armv7" - config SYS_BOARD default "novena"

diff --git a/board/maxbcm/Kconfig b/board/maxbcm/Kconfig index d34e2ab..d833ca0 100644 --- a/board/maxbcm/Kconfig +++ b/board/maxbcm/Kconfig @@ -1,19 +1,12 @@ if TARGET_MAXBCM

-config SYS_CPU - string - default "armv7" - config SYS_BOARD - string default "maxbcm"

config SYS_SOC - string default "armada-xp"

config SYS_CONFIG_NAME - string default "maxbcm"

endif diff --git a/board/ti/ks2_evm/Kconfig b/board/ti/ks2_evm/Kconfig index 96c5f22..384b175 100644 --- a/board/ti/ks2_evm/Kconfig +++ b/board/ti/ks2_evm/Kconfig @@ -27,15 +27,12 @@ endif if TARGET_K2L_EVM

config SYS_BOARD - string default "ks2_evm"

config SYS_VENDOR - string default "ti"

config SYS_CONFIG_NAME - string default "k2l_evm"

endif

Commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs) collected the default values of CONFIG_SYS_CPU into arch/arm/Kconfig.

This commit moves "armv8" to there for consistency.

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Acked-by: Georges Savoundararadj savoundg@gmail.com ---

Changes in v2: None

arch/arm/Kconfig | 3 +-- arch/arm/cpu/armv8/Kconfig | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 arch/arm/cpu/armv8/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d3b80ba..336f3f4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -49,6 +49,7 @@ config SYS_CPU default "armv7" if CPU_V7 default "pxa" if CPU_PXA default "sa1100" if CPU_SA1100 + default "armv8" if ARM64

choice prompt "Target select" @@ -779,8 +780,6 @@ config ARCH_UNIPHIER

endchoice

-source "arch/arm/cpu/armv8/Kconfig" - source "arch/arm/cpu/arm926ejs/davinci/Kconfig"

source "arch/arm/cpu/armv7/exynos/Kconfig" diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig deleted file mode 100644 index 3d1655b..0000000 --- a/arch/arm/cpu/armv8/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -if ARM64 - -config SYS_CPU - default "armv8" - -endif