All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Niedermaier <cniedermaier@dh-electronics.com>
To: u-boot@lists.denx.de
Subject: [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y
Date: Tue, 2 Feb 2021 10:48:21 +0000	[thread overview]
Message-ID: <60b4fbae3d904202a0132edb79cc36f8@dh-electronics.com> (raw)
In-Reply-To: <20210201200725.49959-1-marex@denx.de>

From: Marek Vasut <marex@denx.de>
Sent: Monday, February 1, 2021 9:07 PM

> 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.
> 
> Tested-by: Fabio Estevam <festevam@gmail.com>
> 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
> ---
>  arch/arm/mach-imx/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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

  reply	other threads:[~2021-02-02 10:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-01 20:07 [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y Marek Vasut
2021-02-02 10:48 ` Christoph Niedermaier [this message]
2021-03-01  9:27 ` Stefano Babic
2021-03-01 13:36   ` Marek Vasut
2021-03-01 13:40     ` Stefano Babic
2021-03-01 13:44       ` Stefano Babic
2021-03-01 15:41         ` Marek Vasut
2021-03-01 17:56         ` Tom Rini
2021-03-01 18:43           ` Marek Vasut
2021-03-01 19:28           ` Peter Robinson
2021-03-01 19:42             ` Tom Rini
2021-03-01 20:21               ` Peter Robinson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=60b4fbae3d904202a0132edb79cc36f8@dh-electronics.com \
    --to=cniedermaier@dh-electronics.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.