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.
This commit is contained in:
parent
d7cb72db64
commit
7e41b89b56
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user