summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Hieber <rhi@pengutronix.de>2020-08-07 12:44:24 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-08-14 14:24:51 +0200
commitb0f9f2fe33ca9027a554395c7ff467cabdc255e3 (patch)
treee744a209026ff00e94ffdbe0e5b7ea3a88bbff96
parent80ce928da2c8e0822e91964f0d65afcea5966c1c (diff)
downloadptxdist-b0f9f2fe33ca9027a554395c7ff467cabdc255e3.tar.gz
ptxdist-b0f9f2fe33ca9027a554395c7ff467cabdc255e3.tar.xz
barebox, kernel: enable use of {allyes, allno, allmod, alldef, rand}config
These config targets are documented in the man page, but until now, they only resulted in an error: $ ptxdist alldefconfig kernel ptxdist: Checking dependencies. This may take some seconds. make: *** No rule to make target 'kernel_alldefconfig'. Stop. Both kernel and barebox support all config targets which can be given on the ptxdist command line, so keep the match in the make recipe broad, as the ptxdist option parser will catch unknown config targets. Signed-off-by: Roland Hieber <rhi@pengutronix.de> Message-Id: <20200807104425.30276-2-rhi@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/barebox.make2
-rw-r--r--rules/barebox_mlo.make2
-rw-r--r--rules/kernel.make2
-rw-r--r--rules/templates/template-barebox-imx-habv4-make2
-rw-r--r--rules/templates/template-barebox-make2
-rw-r--r--rules/templates/template-kernel-make2
6 files changed, 6 insertions, 6 deletions
diff --git a/rules/barebox.make b/rules/barebox.make
index 2a9262a44..90e193c8e 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -206,7 +206,7 @@ $(STATEDIR)/barebox.clean:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-barebox_oldconfig barebox_menuconfig barebox_nconfig: $(STATEDIR)/barebox.extract
+barebox_%config: $(STATEDIR)/barebox.extract
@$(call world/kconfig, BAREBOX, $(subst barebox_,,$@))
# vim: syntax=make
diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make
index f0d79f151..ffb2741da 100644
--- a/rules/barebox_mlo.make
+++ b/rules/barebox_mlo.make
@@ -97,7 +97,7 @@ $(STATEDIR)/barebox_mlo.clean:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-barebox_mlo_oldconfig barebox_mlo_menuconfig barebox_mlo_nconfig: $(STATEDIR)/barebox_mlo.extract
+barebox_mlo_%config: $(STATEDIR)/barebox_mlo.extract
@if test -e $(BAREBOX_MLO_CONFIG); then \
cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \
fi
diff --git a/rules/kernel.make b/rules/kernel.make
index c91267c34..593e03dc4 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -322,7 +322,7 @@ endif
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract
+kernel_%config: $(STATEDIR)/kernel.extract
@$(call world/kconfig, KERNEL, $(subst kernel_,,$@))
# vim: syntax=make
diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
index 3ee6e8380..a7d287822 100644
--- a/rules/templates/template-barebox-imx-habv4-make
+++ b/rules/templates/template-barebox-imx-habv4-make
@@ -111,7 +111,7 @@ $(STATEDIR)/barebox-@package@.clean:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-barebox-@package@_oldconfig barebox-@package@_menuconfig barebox-@package@_nconfig: $(STATEDIR)/barebox-@package@.extract
+barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract
@$(call world/kconfig, BAREBOX_@PACKAGE@, $(subst barebox-@package@_,,$@))
# vim: syntax=make
diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
index 9bed9dbeb..ae7e06038 100644
--- a/rules/templates/template-barebox-make
+++ b/rules/templates/template-barebox-make
@@ -91,7 +91,7 @@ $(STATEDIR)/barebox-@package@.clean:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-barebox-@package@_oldconfig barebox-@package@_menuconfig barebox-@package@_nconfig: $(STATEDIR)/barebox-@package@.extract
+barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract
@$(call world/kconfig, BAREBOX_@PACKAGE@, $(subst barebox-@package@_,,$@))
# vim: syntax=make
diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
index c53110165..697c18145 100644
--- a/rules/templates/template-kernel-make
+++ b/rules/templates/template-kernel-make
@@ -114,7 +114,7 @@ $(STATEDIR)/kernel-@package@.targetinstall:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-kernel-@package@_oldconfig kernel-@package@_menuconfig kernel-@package@_nconfig: $(STATEDIR)/kernel-@package@.extract
+kernel-@package@_%config: $(STATEDIR)/kernel-@package@.extract
@$(call world/kconfig, KERNEL_@PACKAGE@, $(subst kernel-@package@_,,$@))
# vim: syntax=make