Re: [U-Boot] [PATCH] arm, imx, Makefile: support CONFIG_MULTI_DTB_FIT
Hi Heiko, On Tue, May 28, 2019 at 1:39 AM Heiko Schocher wrote: > I would reword the commit message and subject to: > """ > arm, imx, Makefile: fix u-boot-dtb.imx build in CONFIG_MULTI_DTB_FIT case > > in case CONFIG_MULTI_DTB_FIT is set and u-boot-dtb.imx > image is build, currently u-boot-dtb.bin is used for > generating the u-boot-dtb.imx binary, which is wrong, as > it contains only a dtb blob not the fit.blob > > Use instead the u-boot-fit-dtb.bin for generating > u-boot-dtb.imx which contains the fit.blob. > """ Yes, much clearer now, thanks :-) ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] arm, imx, Makefile: support CONFIG_MULTI_DTB_FIT
Hello Fabio, Am 27.05.2019 um 14:07 schrieb Fabio Estevam: Hi Heiko, On Mon, May 27, 2019 at 3:08 AM Heiko Schocher wrote: in case CONFIG_MULTI_DTB_FIT is active, use u-boot-fit-dtb.bin. We currently use CONFIG_MULTI_DTB_FIT on mx6sabresd target. Could you please expand the commit log explaining why we need to introduce u-boot-fit-dtb.bin? Ok, I had to recover why I needed this patch (yes, commit message needs update!)... I just working on moving the aristainetos board to support DM/DTB and I need MULTI_DTB_FIT support... When I activated CONFIG_MULTI_DTB_FIT not the fit blob was appended to the u-boot-nodtb.bin to get the u-boot-dtb.imx binary, instead dt/dtb.bin from the dts subdirectory was used. (Yes, currently aristainetos board do not use SPL ...) Reason is: in arch/arm/mach-imx/Makefile: 129 ifeq ($(CONFIG_OF_SEPARATE),y) 130 MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ 131 -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE) 132 u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log 133 134 u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE 135 ifeq ($(DEPFILE_EXISTS),0) 136 $(call if_changed,mkimage) with Makefile 1080 else ifeq ($(CONFIG_OF_SEPARATE),y) 1081 u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE 1082 $(call if_changed,cat) So there is not the fit image appended to u-boot-nodtb.bin to get the u-boot-dtb.imx binary, which my patch fixes. I would reword the commit message and subject to: """ arm, imx, Makefile: fix u-boot-dtb.imx build in CONFIG_MULTI_DTB_FIT case in case CONFIG_MULTI_DTB_FIT is set and u-boot-dtb.imx image is build, currently u-boot-dtb.bin is used for generating the u-boot-dtb.imx binary, which is wrong, as it contains only a dtb blob not the fit.blob Use instead the u-boot-fit-dtb.bin for generating u-boot-dtb.imx which contains the fit.blob. """ Is this OK? bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] arm, imx, Makefile: support CONFIG_MULTI_DTB_FIT
Hi Heiko, On Mon, May 27, 2019 at 3:08 AM Heiko Schocher wrote: > > in case CONFIG_MULTI_DTB_FIT is active, use > u-boot-fit-dtb.bin. We currently use CONFIG_MULTI_DTB_FIT on mx6sabresd target. Could you please expand the commit log explaining why we need to introduce u-boot-fit-dtb.bin? Thanks ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] arm, imx, Makefile: support CONFIG_MULTI_DTB_FIT
in case CONFIG_MULTI_DTB_FIT is active, use u-boot-fit-dtb.bin. Signed-off-by: Heiko Schocher --- clean travis build, see: https://travis-ci.org/hsdenx/u-boot-test/builds/537359339 Makefile | 4 arch/arm/mach-imx/Makefile | 11 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 059978bfe6..8c05e5cff1 100644 --- a/Makefile +++ b/Makefile @@ -1077,6 +1077,10 @@ endif u-boot.bin: u-boot-fit-dtb.bin FORCE $(call if_changed,copy) + +u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE + $(call if_changed,cat) + else ifeq ($(CONFIG_OF_SEPARATE),y) u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE $(call if_changed,cat) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 37675d0558..3a65bd5b28 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -126,7 +126,16 @@ u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE $(call if_changed,mkimage) $(BOARD_SIZE_CHECK) -ifeq ($(CONFIG_OF_SEPARATE),y) +ifeq ($(CONFIG_MULTI_DTB_FIT),y) +MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ + -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE) +u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log + +u-boot-dtb.imx: u-boot-fit-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE +ifeq ($(DEPFILE_EXISTS),0) + $(call if_changed,mkimage) +endif +else ifeq ($(CONFIG_OF_SEPARATE),y) MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE) u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log -- 2.21.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
