diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-10-07 11:32:05 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-10-07 18:31:44 +0200 |
| commit | 7fa9235fb915e537d21054dc6a60af6981969ba5 (patch) | |
| tree | ba1eebf819ce680188fef7e4e09a7d7c54eddbef | |
| parent | db8c3e7ff86d42987585b3b8e0b4cf9191bd5aa0 (diff) | |
| download | ptxdist-7fa9235fb915e537d210.tar.gz ptxdist-7fa9235fb915e537d210.tar.xz | |
kernel, barebox: use explicit list of config targets
The problem with the pattern rule is that it also matches some files, such
as $(PTXDIST_TOPDIR)/config/images/barebox_partitions.config. This results
in strange error messages.
Use a global list of possible config targets and use it to generate
explicit lists of make targets.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/barebox.make | 2 | ||||
| -rw-r--r-- | rules/barebox_mlo.make | 2 | ||||
| -rw-r--r-- | rules/kernel.make | 2 | ||||
| -rw-r--r-- | rules/pre/kernel.make | 4 | ||||
| -rw-r--r-- | rules/templates/template-barebox-imx-habv4-make | 2 | ||||
| -rw-r--r-- | rules/templates/template-barebox-make | 2 | ||||
| -rw-r--r-- | rules/templates/template-kernel-make | 2 |
7 files changed, 10 insertions, 6 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index c2b40c13b..698c05f91 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -207,7 +207,7 @@ $(STATEDIR)/barebox.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox_%config: $(STATEDIR)/barebox.extract +$(call ptx/kconfig-targets, barebox): $(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 ffb2741da..2b09b8fe5 100644 --- a/rules/barebox_mlo.make +++ b/rules/barebox_mlo.make @@ -97,7 +97,7 @@ $(STATEDIR)/barebox_mlo.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox_mlo_%config: $(STATEDIR)/barebox_mlo.extract +$(call ptx/kconfig-targets, barebox_mlo): $(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 6a764ce2f..808e2e6c1 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -323,7 +323,7 @@ endif # oldconfig / menuconfig # ---------------------------------------------------------------------------- -kernel_%config: $(STATEDIR)/kernel.extract +$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) # vim: syntax=make diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make index 3984d7d64..fee34596d 100644 --- a/rules/pre/kernel.make +++ b/rules/pre/kernel.make @@ -104,4 +104,8 @@ endif KERNEL_CROSS_COMPILE := $(KERNEL_TOOLCHAIN_LINK)$(PTXCONF_COMPILER_PREFIX_KERNEL) +define ptx/kconfig-targets +$(addprefix $(strip $(1))_,menuconfig nconfig oldconfig allmodconfig allyesconfig allnoconfig alldefconfig randconfig) +endef + # vim: syntax=make diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make index fe0853b0d..59674585e 100644 --- a/rules/templates/template-barebox-imx-habv4-make +++ b/rules/templates/template-barebox-imx-habv4-make @@ -112,7 +112,7 @@ $(STATEDIR)/barebox-@package@.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract +$(call ptx/kconfig-targets, barebox-@package@): $(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 535317d31..115ea53f1 100644 --- a/rules/templates/template-barebox-make +++ b/rules/templates/template-barebox-make @@ -92,7 +92,7 @@ $(STATEDIR)/barebox-@package@.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract +$(call ptx/kconfig-targets, barebox-@package@): $(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 e9d2df825..d8054badd 100644 --- a/rules/templates/template-kernel-make +++ b/rules/templates/template-kernel-make @@ -115,7 +115,7 @@ $(STATEDIR)/kernel-@package@.targetinstall: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -kernel-@package@_%config: $(STATEDIR)/kernel-@package@.extract +$(call ptx/kconfig-targets, kernel-@package@): $(STATEDIR)/kernel-@package@.extract @$(call world/kconfig, KERNEL_@PACKAGE@, $(subst kernel-@package@_,,$@)) # vim: syntax=make |