Pass the config file to cmd_imx_image as arguments to make it more
flexible. Also add the possibility for another arg containing additional
options.
Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
---
images/Makefile.imx | 4 ++--
scripts/Makefile.lib | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/images/Makefile.imx b/images/Makefile.imx
index ea9346a..e581dbe 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -8,10 +8,10 @@
ifdef CONFIG_ARCH_IMX_XLOAD
$(obj)/%.imximg: $(obj)/% FORCE
$(call cmd,check_file_size,$<,$(CONFIG_ARCH_IMX_UNUSED_IRAM_SIZE))
- $(call if_changed,imx_image)
+ $(call if_changed,imx_image,$(CFG_$(@F)),)
else
$(obj)/%.imximg: $(obj)/% FORCE
- $(call if_changed,imx_image)
+ $(call if_changed,imx_image,$(CFG_$(@F)),)
endif
quiet_cmd_imx_sram_img ?= IMX-SRAM-IMG $@
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index e991f33..27365d8 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -430,8 +430,8 @@ $(obj)/%.dcd.S: $(obj)/%.dcd
imximg-tmp = $(subst $(comma),_,$(dot-target).imxcfg.tmp)
quiet_cmd_imx_image = IMX-IMG $@
- cmd_imx_image = $(CPP) $(imxcfg_cpp_flags) -o $(imximg-tmp) $(CFG_$(@F))
; \
- $(objtree)/scripts/imx/imx-image -o $@ -b -c
$(imximg-tmp) -f $<
+ cmd_imx_image = $(CPP) $(imxcfg_cpp_flags) -o $(imximg-tmp) $(2) ; \
+ $(objtree)/scripts/imx/imx-image -o $@ -b -c
$(imximg-tmp) $(3) -f $<
quiet_cmd_kwb_image = KWB $@
cmd_kwb_image = scripts/kwbimage -p $< $(OPTS_$(@F)) -o $@
--
2.7.0.rc3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
