[PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y

[Christoph Niedermaier <cniedermaier@dh-electronics.com>]

From: Marek Vasut [mailto:marex at denx.de]
Sent: Thursday, February 4, 2021 7:00 PM

> To: u-boot at lists.denx.de
> Cc: Marek Vasut <marex@denx.de>; Christoph Niedermaier <cniedermaier@dh-
> electronics.com>; Fabio Estevam <festevam@gmail.com>; Peng Fan
> <peng.fan@nxp.com>; Simon Glass <sjg@chromium.org>; Stefano Babic
> <sbabic@denx.de>; Ye Li <ye.li@nxp.com>; uboot-imx <uboot-imx@nxp.com>
> Subject: [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if
> OF_SEPARATE=y
> 
> ACHTUNG: Diese E-Mail kommt aus dem Internet und nicht aus unserem
> Firmennetzwerk!
> 
> 
> 
> The u-boot-with-spl.imx is a concatenation of SPL and u-boot.uim.
> The u-boot.uim is u-boot.bin wrapped in uImage. In case OF_SEPARATE
> is enabled, the u-boot.bin does not contain control DT for U-Boot,
> and so u-boot.uim does not contain the DT, and so u-boot-with-spl.imx
> does not contain the DT, and a system where u-boot-with-spl.imx is
> written to offset 1024B to the start of storage no longer boots, as
> it is missing DT.
> 
> In case OF_SEPARATE is enabled, u-boot.img contains both u-boot.bin
> and the necessary DTs. Therefore, use u-boot.img instead of u-boot.uim
> to generate u-boot-with-spl.imx when OF_SEPARATE is enabled.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Christoph Niedermaier <cniedermaier@dh-electronics.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Ye Li <ye.li@nxp.com>
> Cc: uboot-imx <uboot-imx@nxp.com>
> ---
> V2: Swap the u-boot.uim <-> u-boot.img in the conditional so this would
>     match the patch which Fabio originally tested
> V3: - Correct the u-boot.img/u-boot.uim dependency in top-level Makefile
>     - Drop TB from Fabio, this needs to be retested
> ---
>  Makefile                   | 2 +-
>  arch/arm/mach-imx/Makefile | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index b4f1cbcf9bd..2b308a6aac0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1542,7 +1542,7 @@ flash.bin: spl/u-boot-spl.bin u-boot.itb FORCE
>  endif
>  endif
> 
> -u-boot-with-spl.imx u-boot-with-nand-spl.imx: SPL u-boot.bin FORCE
> +u-boot-with-spl.imx u-boot-with-nand-spl.imx: SPL $(if
> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE
>         $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
> 
>  MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e
> $(CONFIG_SYS_TEXT_BASE)
> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> index 1aa26a50ad8..e6b4654cd35 100644
> --- a/arch/arm/mach-imx/Makefile
> +++ b/arch/arm/mach-imx/Makefile
> @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@
>  quiet_cmd_pad_cat = CAT     $@
>  cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@
> 
> -u-boot-with-spl.imx: SPL u-boot.uim FORCE
> +u-boot-with-spl.imx: SPL $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-
> boot.uim) FORCE
>         $(call if_changed,pad_cat)
> 
> -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE
> +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if
> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE
>         $(call if_changed,pad_cat)
> 
>  quiet_cmd_u-boot-nand-spl_imx = GEN     $@
> --
> 2.29.2

Tested-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>


Best regards
Christoph Niedermaier

____________________________________________________________________________________
DH electronics GmbH | Am Anger 8 | 83346 Bergen | Germany | Fon: +49 8662 4882 0
HRB Traunstein 9602 | Ust Id Nr.: DE174205805
Board of Management | Dipl.-Ing.(FH) Stefan Daxenberger | Dipl.-Ing.(FH) Helmut Henschke