From 9881546f83d807531e2df1b3db69d8cd95d7a7bd Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 1 Aug 2015 16:39:13 +0900 Subject: [PATCH] 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 --- arch/arm/Kconfig | 2 +- configs/versatileab_defconfig | 1 - configs/versatilepb_defconfig | 1 - configs/versatileqemu_defconfig | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 750e1fd720..b06e511196 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -121,7 +121,7 @@ config SOC_SAMA5D4 choice prompt "Target select" - optional + default ARCH_VERSATILE config ARCH_AT91 bool "Atmel AT91" diff --git a/configs/versatileab_defconfig b/configs/versatileab_defconfig index 765fe6ee23..3dc7d19660 100644 --- a/configs/versatileab_defconfig +++ b/configs/versatileab_defconfig @@ -1,5 +1,4 @@ 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 diff --git a/configs/versatilepb_defconfig b/configs/versatilepb_defconfig index 1973c38d4d..9fe83b97c3 100644 --- a/configs/versatilepb_defconfig +++ b/configs/versatilepb_defconfig @@ -1,5 +1,4 @@ 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 diff --git a/configs/versatileqemu_defconfig b/configs/versatileqemu_defconfig index ea9c5b93f2..9ddef4d9bd 100644 --- a/configs/versatileqemu_defconfig +++ b/configs/versatileqemu_defconfig @@ -1,5 +1,4 @@ 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 -- 2.39.2