ARM: drop "optional" from target select in favor of ARCH_VERSATILE

Since commit a26cd04920dc ("arch: Make board selection choices
optional"), Kconfig could create such an insane .config file that
no SoC/board is selected.

This is now a real problem for Buildroot, for example.
(http://lists.busybox.net/pipermail/buildroot/2015-July/135125.html)

This commit drops the "optional" from the ARM target select menu
in favor of "Versatile family".

Rationale:
 - Historically, Linux chose versatile_defconfig as the default
   of ARM defconfig. (arch/arm/Makefile of Linux describes:
   KBUILD_DEFCONFIG := versatile_defconfig)

 - It was published by ARM Ltd.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 750e1fd720dd47a8c6328ad5a56495531345a148..b06e511196c25f7dc829e092b2412af06b832a1e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -121,7 +121,7 @@ config SOC_SAMA5D4
 
 choice
        prompt "Target select"
 
 choice
        prompt "Target select"

-       optional
+       default ARCH_VERSATILE

 
 config ARCH_AT91
        bool "Atmel AT91"
 
 config ARCH_AT91
        bool "Atmel AT91"

diff --git a/configs/versatileab_defconfig b/configs/versatileab_defconfig
index 765fe6ee232e7a561cfc291414d08b155bccc79d..3dc7d19660b5da9f9b2633977eada50de164d012 100644 (file)
--- a/configs/versatileab_defconfig
+++ b/configs/versatileab_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
 CONFIG_ARM=y

-CONFIG_ARCH_VERSATILE=y

 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB"
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB"
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set

diff --git a/configs/versatilepb_defconfig b/configs/versatilepb_defconfig
index 1973c38d4dabe7d58c3f947fa7a4c7f7744c4ebb..9fe83b97c30c7c2f322456d4ddee0675575c885c 100644 (file)
--- a/configs/versatilepb_defconfig
+++ b/configs/versatilepb_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
 CONFIG_ARM=y

-CONFIG_ARCH_VERSATILE=y

 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB"
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB"
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set

diff --git a/configs/versatileqemu_defconfig b/configs/versatileqemu_defconfig
index ea9c5b93f2ec662f45c4be294abe93c123f6f5f3..9ddef4d9bdd63a38f8497efe6a5d1326042c40ea 100644 (file)
--- a/configs/versatileqemu_defconfig
+++ b/configs/versatileqemu_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
 CONFIG_ARM=y

-CONFIG_ARCH_VERSATILE=y

 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB"
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB"
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set