summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/device/Atmel/at91rm9200df/at91rm9200df_defconfig6
-rw-r--r--target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig6
-rw-r--r--target/device/Atmel/atngw100-base/atngw100-base_defconfig6
-rw-r--r--target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig6
-rw-r--r--target/device/Atmel/atstk1005/atstk1005_defconfig6
-rw-r--r--target/linux/Config.in.advanced5
-rw-r--r--target/linux/Makefile.in.advanced2
7 files changed, 18 insertions, 19 deletions
diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig b/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
index 60018ca56..f72e34114 100644
--- 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 b2ca812b3..965d265ac 100644
--- 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 aacac6f88..93ecf4087 100644
--- 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 66e351bbd..4852ba936 100644
--- 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 1642f0f5b..72af0bd97 100644
--- 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 45cf0fc22..4bcfbb363 100644
--- 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 9a7f0fdf0..45fb4cb72 100644
--- 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
# -----------------------------------------------------------------------------