| Message ID | 20200605093256.30351-11-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel: Allow targets to use Kconfig | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > Allow use of target-specific Kconfig file. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index f8a45e1379..d5009cd304 100644 > --- a/Makefile > +++ b/Makefile > @@ -423,11 +423,13 @@ MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \ > $(SRC_PATH)/accel/Kconfig \ > $(SRC_PATH)/hw/Kconfig > MINIKCONF_DEPS = $(MINIKCONF_INPUTS) \ > - $(wildcard $(SRC_PATH)/hw/*/Kconfig) > + $(wildcard $(SRC_PATH)/hw/*/Kconfig) \ > + $(wildcard $(SRC_PATH)/target/*/Kconfig) > MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py > > $(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak > $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \ > + $(wildcard $(SRC_PATH)/target/$(call base-arch, $(firstword $(subst -, ,$@)))/Kconfig) \ As discussed on IRC I think we can emit base-arch into config-host.mak from exiting data and then utilise that rather than re-coding the data inside rules.mak. Otherwise: Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/Makefile b/Makefile index f8a45e1379..d5009cd304 100644 --- a/Makefile +++ b/Makefile @@ -423,11 +423,13 @@ MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \ $(SRC_PATH)/accel/Kconfig \ $(SRC_PATH)/hw/Kconfig MINIKCONF_DEPS = $(MINIKCONF_INPUTS) \ - $(wildcard $(SRC_PATH)/hw/*/Kconfig) + $(wildcard $(SRC_PATH)/hw/*/Kconfig) \ + $(wildcard $(SRC_PATH)/target/*/Kconfig) MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py $(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \ + $(wildcard $(SRC_PATH)/target/$(call base-arch, $(firstword $(subst -, ,$@)))/Kconfig) \ > $@.tmp, "GEN", "$@.tmp") $(call quiet-command, if test -f $@; then \ if cmp -s $@.old $@; then \