diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-18 12:05:16 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-18 12:05:16 +0000 |
| commit | e1c27ce98544acbbd0689f589500c8dce2e5f67c (patch) | |
| tree | 0cf2e21dbb0e93a4300184f3aedde745ef27c277 /include | |
| parent | 6a47391ec7925494db97afb26a9f52baf0047548 (diff) | |
| download | upstream-e1c27ce98544acbbd0689f589500c8dce2e5f67c.tar.gz upstream-e1c27ce98544acbbd0689f589500c8dce2e5f67c.tar.bz2 upstream-e1c27ce98544acbbd0689f589500c8dce2e5f67c.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/toplevel.mk | 11 |
1 files changed, 8 insertions, 3 deletions
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 \ |