[U-Boot] [PATCH 0/2] Follow-up patches for commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs)
Masahiro Yamada (2): kconfig: arm: select CPU_V7 for some new boards kconfig: arm: move "armv8" define to arch/arm/Kconfig
arch/arm/Kconfig | 5 +++-- arch/arm/cpu/armv7/tegra-common/Kconfig | 4 ---- arch/arm/cpu/armv8/Kconfig | 6 ------ board/Marvell/db-mv784mp-gp/Kconfig | 8 -------- board/maxbcm/Kconfig | 7 ------- board/sunxi/Kconfig | 1 - board/ti/ks2_evm/Kconfig | 3 --- 7 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 arch/arm/cpu/armv8/Kconfig
Marvell DB-MV784MP-GP and maxBCM are pretty new boards and were missed by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).
This commit adds "select CPU_V7" for them and remove redundant "config SYS_CPU" and "string" directives.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Savoundararadj savoundg@gmail.com ---
arch/arm/Kconfig | 2 ++ arch/arm/cpu/armv7/tegra-common/Kconfig | 4 ---- board/Marvell/db-mv784mp-gp/Kconfig | 8 -------- board/maxbcm/Kconfig | 7 ------- board/sunxi/Kconfig | 1 - board/ti/ks2_evm/Kconfig | 3 --- 6 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1bad202..76ac2b6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -229,9 +229,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" 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/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/sunxi/Kconfig b/board/sunxi/Kconfig index 28df187..4aea0ee 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -1,7 +1,6 @@ if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I || TARGET_SUN8I
config SYS_CONFIG_NAME - string default "sun4i" if TARGET_SUN4I default "sun5i" if TARGET_SUN5I default "sun6i" if TARGET_SUN6I 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
On 31.10.2014 06:26, Masahiro Yamada wrote:
Marvell DB-MV784MP-GP and maxBCM are pretty new boards and were missed by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).
This commit adds "select CPU_V7" for them and remove redundant "config SYS_CPU" and "string" directives.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Savoundararadj savoundg@gmail.com
Thanks Masahiro-san for taking care of this. As always, you are really amazingly active and attentive!
Acked-by: Stefan Roese sr@denx.de
Thanks, Stefan
Hi Masahiro,
Le 31/10/2014 07:59, Stefan Roese a écrit :
On 31.10.2014 06:26, Masahiro Yamada wrote:
Marvell DB-MV784MP-GP and maxBCM are pretty new boards and were missed by commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs).
This commit adds "select CPU_V7" for them and remove redundant "config SYS_CPU" and "string" directives.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Savoundararadj savoundg@gmail.com
Thanks Masahiro-san for taking care of this. As always, you are really amazingly active and attentive!
Acked-by: Stefan Roese sr@denx.de
Thanks, Stefan
I think I have missed these boards during the rebasing.
Thanks for spotting this.
Acked-by: Georges Savoundararadj savoundg@gmail.com
Best regards,
Georges
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 Cc: Savoundararadj savoundg@gmail.com ---
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 76ac2b6..3db3257 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" @@ -800,8 +801,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
Hi Masahiro,
Le 31/10/2014 06:26, Masahiro Yamada a écrit :
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 Cc: Savoundararadj savoundg@gmail.com
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 76ac2b6..3db3257 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"
@@ -800,8 +801,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
Acked-by: Georges Savoundararadj savoundg@gmail.com
Best regards,
Georges
participants (3)
-
Georges Savoundararadj -
Masahiro Yamada -
Stefan Roese