Skip to content

Commit 126f2b2

Browse files
dfandrichDenys Vlasenko
authored and
Denys Vlasenko
committed
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 <[email protected]> Signed-off-by: Denys Vlasenko <[email protected]>
1 parent 319b8bb commit 126f2b2

File tree

7 files changed

+9
-12
lines changed

7 files changed

+9
-12
lines changed

INSTALL

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ create a known starting point.
7070
Other starting configurations (mostly used for testing purposes) include
7171
"make allbareconfig" (enables all applets but disables all optional features),
7272
"make allyesconfig" (enables absolutely everything including debug features),
73-
and "make randconfig" (produce a random configuration).
73+
and "make randconfig" (produce a random configuration). The configs/ directory
74+
contains a number of additional configuration files ending in _defconfig which
75+
are useful in specific cases. "make help" will list them.
7476

7577
Configuring BusyBox produces a file ".config", which can be saved for future
7678
use. Run "make oldconfig" to bring a .config file from an older version of

Makefile

+1-10
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ rpm: FORCE
10421042
# Brief documentation of the typical targets used
10431043
# ---------------------------------------------------------------------------
10441044

1045-
boards := $(wildcard $(srctree)/arch/$(ARCH)/configs/*_defconfig)
1045+
boards := $(wildcard $(srctree)/configs/*_defconfig)
10461046
boards := $(notdir $(boards))
10471047

10481048
-include $(srctree)/Makefile.help
@@ -1131,15 +1131,6 @@ clean: $(clean-dirs)
11311131
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \
11321132
-type f -print | xargs rm -f
11331133

1134-
help:
1135-
@echo ' Building external modules.'
1136-
@echo ' Syntax: make -C path/to/kernel/src M=$$PWD target'
1137-
@echo ''
1138-
@echo ' modules - default target, build the module(s)'
1139-
@echo ' modules_install - install the module'
1140-
@echo ' clean - remove generated files in module directory only'
1141-
@echo ''
1142-
11431134
# Dummies...
11441135
PHONY += prepare scripts
11451136
prepare: ;

Makefile.help

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ help:
2525
@echo ' You can use these commands if the commands on the host'
2626
@echo ' is unusable. Afterwards use it like:'
2727
@echo ' make SED="$(objtree)/sed"'
28+
@$(if $(boards), \
29+
$(foreach b, $(boards), \
30+
printf " %-21s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
31+
echo '')
2832
@echo
2933
@echo 'Installation:'
3034
@echo ' install - install busybox into CONFIG_PREFIX'
File renamed without changes.
File renamed without changes.
File renamed without changes.

scripts/kconfig/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ endif
8787
$(MTIME_IS_COARSE) && sleep 1
8888

8989
%_defconfig: $(obj)/conf
90-
$(Q)$< -D $@ Config.in
90+
$(Q)$< -D configs/$@ Config.in
9191
$(MTIME_IS_COARSE) && sleep 1
9292

9393
# Help text used by make help

0 commit comments

Comments
 (0)