From f6a0204436d51e2227a1b9c8f0463936a9c03f0a Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 18 Apr 2013 12:05:16 +0000 Subject: build: add new menuconfig code based on linux 3.9 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36361 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/toplevel.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/toplevel.mk b/include/toplevel.mk index 5e8e6dd1ba..708228600c 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -89,10 +89,15 @@ config-clean: FORCE defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config - $< -D .config Config.in + $< --defconfig .config Config.in + +confdefault-y=allyes +confdefault-m=allmod +confdefault-n=allno +confdefault:=$(confdefault-$(CONFDEFAULT)) oldconfig: scripts/config/conf prepare-tmpinfo FORCE - $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in + $< --$(if $(confdefault),$(confdefault),old)config Config.in menuconfig: scripts/config/mconf prepare-tmpinfo FORCE if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \ @@ -147,7 +152,7 @@ prereq:: prepare-tmpinfo .config @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq @( \ cp .config tmp/.config; \ - ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ + ./scripts/config/conf --defconfig tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \ printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \ fi \ -- cgit v1.2.3