From 126f2b2853502a7e74e73c11b86a25510a76b9c0 Mon Sep 17 00:00:00 2001 From: Daniel Fandrich Date: Fri, 8 Jul 2011 07:59:16 +0200 Subject: [PATCH] Support configuring Busybox from _defconfig files The existing test .config files are moved to configs/ and renamed to *_defconfig. 'make xyz_defconfig' will enable the configuration in that specific file. Signed-off-by: Daniel Fandrich Signed-off-by: Denys Vlasenko --- INSTALL | 4 +++- Makefile | 11 +---------- Makefile.help | 4 ++++ TEST_config_nommu => configs/TEST_config_nommu | 0 TEST_config_noprintf => configs/TEST_config_noprintf | 0 TEST_config_rh9 => configs/TEST_config_rh9 | 0 scripts/kconfig/Makefile | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) rename TEST_config_nommu => configs/TEST_config_nommu (100%) rename TEST_config_noprintf => configs/TEST_config_noprintf (100%) rename TEST_config_rh9 => configs/TEST_config_rh9 (100%) diff --git a/INSTALL b/INSTALL index 670a924e5..f93e5fb25 100644 --- a/INSTALL +++ b/INSTALL @@ -70,7 +70,9 @@ create a known starting point. Other starting configurations (mostly used for testing purposes) include "make allbareconfig" (enables all applets but disables all optional features), "make allyesconfig" (enables absolutely everything including debug features), -and "make randconfig" (produce a random configuration). +and "make randconfig" (produce a random configuration). The configs/ directory +contains a number of additional configuration files ending in _defconfig which +are useful in specific cases. "make help" will list them. Configuring BusyBox produces a file ".config", which can be saved for future use. Run "make oldconfig" to bring a .config file from an older version of diff --git a/Makefile b/Makefile index c58097d1f..0fb3d4c72 100644 --- a/Makefile +++ b/Makefile @@ -1042,7 +1042,7 @@ rpm: FORCE # Brief documentation of the typical targets used # --------------------------------------------------------------------------- -boards := $(wildcard $(srctree)/arch/$(ARCH)/configs/*_defconfig) +boards := $(wildcard $(srctree)/configs/*_defconfig) boards := $(notdir $(boards)) -include $(srctree)/Makefile.help @@ -1131,15 +1131,6 @@ clean: $(clean-dirs) -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ -type f -print | xargs rm -f -help: - @echo ' Building external modules.' - @echo ' Syntax: make -C path/to/kernel/src M=$$PWD target' - @echo '' - @echo ' modules - default target, build the module(s)' - @echo ' modules_install - install the module' - @echo ' clean - remove generated files in module directory only' - @echo '' - # Dummies... PHONY += prepare scripts prepare: ; diff --git a/Makefile.help b/Makefile.help index 999d0298e..119dd6f89 100644 --- a/Makefile.help +++ b/Makefile.help @@ -25,6 +25,10 @@ help: @echo ' You can use these commands if the commands on the host' @echo ' is unusable. Afterwards use it like:' @echo ' make SED="$(objtree)/sed"' + @$(if $(boards), \ + $(foreach b, $(boards), \ + printf " %-21s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \ + echo '') @echo @echo 'Installation:' @echo ' install - install busybox into CONFIG_PREFIX' diff --git a/TEST_config_nommu b/configs/TEST_config_nommu similarity index 100% rename from TEST_config_nommu rename to configs/TEST_config_nommu diff --git a/TEST_config_noprintf b/configs/TEST_config_noprintf similarity index 100% rename from TEST_config_noprintf rename to configs/TEST_config_noprintf diff --git a/TEST_config_rh9 b/configs/TEST_config_rh9 similarity index 100% rename from TEST_config_rh9 rename to configs/TEST_config_rh9 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index b5708e2e4..1651390a6 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -87,7 +87,7 @@ endif $(MTIME_IS_COARSE) && sleep 1 %_defconfig: $(obj)/conf - $(Q)$< -D $@ Config.in + $(Q)$< -D configs/$@ Config.in $(MTIME_IS_COARSE) && sleep 1 # Help text used by make help