target/linux-advanced: default to menuconfig for all archs

Default to menuconfig for atmel targets as well, mention QT3 dependency
for make xconfig and update affected defconfigs.

diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig b/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
index 60018ca56d1989cbf9eb8537baa565e2e923e337..f72e34114b05f61dafd4d47c96e73a8c19d02c49 100644 (file)
--- a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
+++ b/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
@@ -996,9 +996,9 @@ BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
 BR2_PACKAGE_LINUX_USE_KCONFIG=y
 # BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
 # BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-BR2_MAKE_XCONFIG=y
-# BR2_MAKE_MENUCONFIG is not set
-BR2_KERNEL_CONFIG_METHOD="xconfig"
+# BR2_MAKE_XCONFIG is not set
+BR2_MAKE_MENUCONFIG=y
+BR2_KERNEL_CONFIG_METHOD="menuconfig"
 # BR2_LINUX_BIN_BZIMAGE is not set
 BR2_LINUX_BIN_UIMAGE=y
 # BR2_LINUX_BIN_VMLINUX is not set

diff --git a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig
index b2ca812b371f05d1cfe023a114ee1f970f5377f9..965d265ac406a120e6df9925f3e177d9d3953d97 100644 (file)
--- a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig
+++ b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig
@@ -882,9 +882,9 @@ BR2_LINUX26_VERSION="$(BR2_LINUX26_RC_VERSION)"
 BR2_PACKAGE_LINUX_USE_KCONFIG=y
 # BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
 # BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-BR2_MAKE_XCONFIG=y
-# BR2_MAKE_MENUCONFIG is not set
-BR2_KERNEL_CONFIG_METHOD="xconfig"
+# BR2_MAKE_XCONFIG is not set
+BR2_MAKE_MENUCONFIG=y
+BR2_KERNEL_CONFIG_METHOD="menuconfig"
 # BR2_LINUX_BIN_BZIMAGE is not set
 BR2_LINUX_BIN_UIMAGE=y
 # BR2_LINUX_BIN_VMLINUX is not set

diff --git a/target/device/Atmel/atngw100-base/atngw100-base_defconfig b/target/device/Atmel/atngw100-base/atngw100-base_defconfig
index aacac6f8899c01fa562c6ced26ae085506fa7a87..93ecf40870902e53b769d42cd91272efa54dff07 100644 (file)
--- a/target/device/Atmel/atngw100-base/atngw100-base_defconfig
+++ b/target/device/Atmel/atngw100-base/atngw100-base_defconfig
@@ -587,9 +587,9 @@ BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
 BR2_PACKAGE_LINUX_USE_KCONFIG=y
 # BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
 # BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-BR2_MAKE_XCONFIG=y
-# BR2_MAKE_MENUCONFIG is not set
-BR2_KERNEL_CONFIG_METHOD="xconfig"
+# BR2_MAKE_XCONFIG is not set
+BR2_MAKE_MENUCONFIG=y
+BR2_KERNEL_CONFIG_METHOD="menuconfig"
 # BR2_LINUX_BIN_BZIMAGE is not set
 BR2_LINUX_BIN_UIMAGE=y
 # BR2_LINUX_BIN_VMLINUX is not set

diff --git a/target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig b/target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig
index 66e351bbd9bb6d33ed9e3d7395639286a5704c1f..4852ba93622d00926b85ea546879791a60291eb5 100644 (file)
--- a/target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig
+++ b/target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig
@@ -1091,9 +1091,9 @@ BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
 BR2_PACKAGE_LINUX_USE_KCONFIG=y
 # BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
 # BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-BR2_MAKE_XCONFIG=y
-# BR2_MAKE_MENUCONFIG is not set
-BR2_KERNEL_CONFIG_METHOD="xconfig"
+# BR2_MAKE_XCONFIG is not set
+BR2_MAKE_MENUCONFIG=y
+BR2_KERNEL_CONFIG_METHOD="menuconfig"
 # BR2_LINUX_BIN_BZIMAGE is not set
 BR2_LINUX_BIN_UIMAGE=y
 # BR2_LINUX_BIN_VMLINUX is not set

diff --git a/target/device/Atmel/atstk1005/atstk1005_defconfig b/target/device/Atmel/atstk1005/atstk1005_defconfig
index 1642f0f5bda689b9d9b1a2d154db3c6b392d53d4..72af0bd97330eecfd30e78f9ee8e768d62845277 100644 (file)
--- a/target/device/Atmel/atstk1005/atstk1005_defconfig
+++ b/target/device/Atmel/atstk1005/atstk1005_defconfig
@@ -857,9 +857,9 @@ BR2_LINUX26_VERSION="$(BR2_KERNEL_CURRENT_VERSION)"
 BR2_PACKAGE_LINUX_USE_KCONFIG=y
 # BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
 # BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-BR2_MAKE_XCONFIG=y
-# BR2_MAKE_MENUCONFIG is not set
-BR2_KERNEL_CONFIG_METHOD="xconfig"
+# BR2_MAKE_XCONFIG is not set
+BR2_MAKE_MENUCONFIG=y
+BR2_KERNEL_CONFIG_METHOD="menuconfig"
 # BR2_LINUX_BIN_BZIMAGE is not set
 BR2_LINUX_BIN_UIMAGE=y
 # BR2_LINUX_BIN_VMLINUX is not set

diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index 45cf0fc22461335500cf521a1ce3f6d1bfdb6f57..4bcfbb3636055b210013663167a55756354f3ef9 100644 (file)
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -390,7 +390,7 @@ config BR2_PACKAGE_LINUX_USE_XCONFIG
        bool "Run make ARCH=$(ARCH) [xconfig|menuconfig] before build"
        depends on BR2_PACKAGE_LINUX
        help
-         Configure Linux by make xconfig
+         Configure Linux by make xconfig|menuconfig
 endchoice
 
 config BR2_PACKAGE_LINUX_KCONFIG
@@ -406,14 +406,13 @@ config BR2_PACKAGE_LINUX_KCONFIG
 
 choice
        prompt "Preferred config tool"
-       default BR2_MAKE_XCONFIG if BR2_TARGET_ATMEL
        default BR2_MAKE_MENUCONFIG
        depends on BR2_PACKAGE_LINUX_USE_XCONFIG
        help
          Define the preferred tool to invoke if a configuration is invalid
 
 config BR2_MAKE_XCONFIG
-       bool "make xconfig"
+       bool "make xconfig (needs QT3 headers on host)"
        help
          Run "make xconfig" if kernel ".config" is invalid
 

diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 9a7f0fdf029e3691f352fb1c077ce23bd526b571..45fb4cb7218663e43981073ff00f908f14be72f4 100644 (file)
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -112,7 +112,7 @@ endif
 KERNEL_CONFIG_METHOD:=$(strip $(subst ",,$(BR2_KERNEL_CONFIG_METHOD)))
 #"))
 ifeq ($(KERNEL_CONFIG_METHOD),)
-KERNEL_CONFIG_METHOD:=xconfig
+KERNEL_CONFIG_METHOD:=menuconfig
 endif
 
 # -----------------------------------------------------------------------------