aboutsummaryrefslogtreecommitdiffstats
path: root/include/toplevel.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-18 12:05:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-04-18 12:05:16 +0000
commit9d5510a500a1804484152adb8951dda3688658bc (patch)
tree6e4d8725c2956742201d0e14126f7e457b453c66 /include/toplevel.mk
parent97e7fdf6fdb8a91da52f622b499181171262af19 (diff)
downloadupstream-9d5510a500a1804484152adb8951dda3688658bc.tar.gz
upstream-9d5510a500a1804484152adb8951dda3688658bc.tar.bz2
upstream-9d5510a500a1804484152adb8951dda3688658bc.zip
build: add new menuconfig code based on linux 3.9
SVN-Revision: 36361
Diffstat (limited to 'include/toplevel.mk')
-rw-r--r--include/toplevel.mk11
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 \