diff mbox series

arm: dts: imx8mp: Generate single bootable binary

Message ID 20210825152503.1069374-1-t.remmet@phytec.de
State Superseded
Delegated to: Stefano Babic
Headers show
Series arm: dts: imx8mp: Generate single bootable binary | expand

Commit Message

Teresa Remmet Aug. 25, 2021, 3:25 p.m. UTC
binman conversion made flashing flash.bin
and u-boot.itb necessary. Update binman config
to create a single flash.bin image again.

This updates imx8mp_evk and phyCORE-i.MX8MP as they share the
same binman config.

Updated also imx8mp_evk documentation.

Tested on phyCORE-i.MX8MP.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/dts/imx8mp-u-boot.dtsi                 | 17 ++++++++++++++++-
 .../imx8mp_evk/imximage-8mp-lpddr4.cfg          |  2 +-
 board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg |  2 +-
 doc/board/nxp/imx8mp_evk.rst                    |  1 -
 4 files changed, 18 insertions(+), 4 deletions(-)

Comments

Fabio Estevam Aug. 25, 2021, 3:56 p.m. UTC | #1
Hi Teresa,

On Wed, Aug 25, 2021 at 12:25 PM Teresa Remmet <t.remmet@phytec.de> wrote:
>
> binman conversion made flashing flash.bin
> and u-boot.itb necessary. Update binman config
> to create a single flash.bin image again.
>
> This updates imx8mp_evk and phyCORE-i.MX8MP as they share the
> same binman config.
>
> Updated also imx8mp_evk documentation.
>
> Tested on phyCORE-i.MX8MP.

Thanks for taking care of this.

> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> ---
>  arch/arm/dts/imx8mp-u-boot.dtsi                 | 17 ++++++++++++++++-
>  .../imx8mp_evk/imximage-8mp-lpddr4.cfg          |  2 +-
>  board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg |  2 +-
>  doc/board/nxp/imx8mp_evk.rst                    |  1 -
>  4 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
> index a6ede2ed6e30..ace7b2051e7f 100644
> --- a/arch/arm/dts/imx8mp-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-u-boot.dtsi
> @@ -82,7 +82,7 @@
>                 };
>         };
>
> -       flash {
> +       spl {

To make this more standard, could you please also pass 'filename =
"spl.bin" here too?

Please check:
https://lists.denx.de/pipermail/u-boot/2021-August/458754.html

>  BOOT_FROM      sd
> -LOADER         mkimage.flash.mkimage   0x920000
> +LOADER         mkimage.spl.mkimage     0x920000

Please use "LOADER u-boot-spl-ddr.bin  0x920000" here instead.

> diff --git a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
> index b2920b4908ed..2be18de674ba 100644
> --- a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
> +++ b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
> @@ -7,4 +7,4 @@
>
>  ROM_VERSION    v2
>  BOOT_FROM      sd
> -LOADER         mkimage.flash.mkimage   0x920000
> +LOADER         mkimage.spl.mkimage     0x920000

Ditto.

With these changes, you can add:

Reviewed-by: Fabio Estevam <festevam@gmail.com>

Thanks
Heiko Schocher Aug. 26, 2021, 2:54 a.m. UTC | #2
Hello Teresa,

On 25.08.21 17:25, Teresa Remmet wrote:
> binman conversion made flashing flash.bin
> and u-boot.itb necessary. Update binman config
> to create a single flash.bin image again.
> 
> This updates imx8mp_evk and phyCORE-i.MX8MP as they share the
> same binman config.
> 
> Updated also imx8mp_evk documentation.
> 
> Tested on phyCORE-i.MX8MP.
> 
> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> ---
>  arch/arm/dts/imx8mp-u-boot.dtsi                 | 17 ++++++++++++++++-
>  .../imx8mp_evk/imximage-8mp-lpddr4.cfg          |  2 +-
>  board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg |  2 +-
>  doc/board/nxp/imx8mp_evk.rst                    |  1 -
>  4 files changed, 18 insertions(+), 4 deletions(-)

No more comments beside Fabios, so

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Teresa Remmet Aug. 26, 2021, 8:07 a.m. UTC | #3
Am Mittwoch, den 25.08.2021, 12:56 -0300 schrieb Fabio Estevam:
> Hi Teresa,
> 
> On Wed, Aug 25, 2021 at 12:25 PM Teresa Remmet <t.remmet@phytec.de>
> wrote:
> > binman conversion made flashing flash.bin
> > and u-boot.itb necessary. Update binman config
> > to create a single flash.bin image again.
> > 
> > This updates imx8mp_evk and phyCORE-i.MX8MP as they share the
> > same binman config.
> > 
> > Updated also imx8mp_evk documentation.
> > 
> > Tested on phyCORE-i.MX8MP.
> 
> Thanks for taking care of this.
> 
> > Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> > ---
> >  arch/arm/dts/imx8mp-u-boot.dtsi                 | 17
> > ++++++++++++++++-
> >  .../imx8mp_evk/imximage-8mp-lpddr4.cfg          |  2 +-
> >  board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg |  2 +-
> >  doc/board/nxp/imx8mp_evk.rst                    |  1 -
> >  4 files changed, 18 insertions(+), 4 deletions(-)
> > 
> > diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-
> > u-boot.dtsi
> > index a6ede2ed6e30..ace7b2051e7f 100644
> > --- a/arch/arm/dts/imx8mp-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8mp-u-boot.dtsi
> > @@ -82,7 +82,7 @@
> >                 };
> >         };
> > 
> > -       flash {
> > +       spl {
> 
> To make this more standard, could you please also pass 'filename =
> "spl.bin" here too?
> 
> Please check:
> https://lists.denx.de/pipermail/u-boot/2021-August/458754.html

Oh, I missed the latest version of your patch. I will update this
accordingly. Thanks.

Teresa

> 
> >  BOOT_FROM      sd
> > -LOADER         mkimage.flash.mkimage   0x920000
> > +LOADER         mkimage.spl.mkimage     0x920000
> 
> Please use "LOADER u-boot-spl-ddr.bin  0x920000" here instead.
> 
> > diff --git a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
> > b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
> > index b2920b4908ed..2be18de674ba 100644
> > --- a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
> > +++ b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
> > @@ -7,4 +7,4 @@
> > 
> >  ROM_VERSION    v2
> >  BOOT_FROM      sd
> > -LOADER         mkimage.flash.mkimage   0x920000
> > +LOADER         mkimage.spl.mkimage     0x920000
> 
> Ditto.
> 
> With these changes, you can add:
> 
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
> 
> Thanks
diff mbox series

Patch

diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index a6ede2ed6e30..ace7b2051e7f 100644
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -82,7 +82,7 @@ 
 		};
 	};
 
-	flash {
+	spl {
 		mkimage {
 			args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x920000";
 
@@ -149,4 +149,19 @@ 
 			};
 		};
 	};
+
+	imx-boot {
+		filename = "flash.bin";
+		pad-byte = <0x00>;
+
+		spl: blob-ext@1 {
+			filename = "spl.bin";
+			offset = <0x0>;
+		};
+
+		uboot: blob-ext@2 {
+			filename = "u-boot.itb";
+			offset = <0x58000>;
+		};
+	};
 };
diff --git a/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg b/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg
index b2920b4908ed..2be18de674ba 100644
--- a/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg
+++ b/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg
@@ -7,4 +7,4 @@ 
 
 ROM_VERSION	v2
 BOOT_FROM	sd
-LOADER		mkimage.flash.mkimage	0x920000
+LOADER		mkimage.spl.mkimage	0x920000
diff --git a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
index b2920b4908ed..2be18de674ba 100644
--- a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
+++ b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
@@ -7,4 +7,4 @@ 
 
 ROM_VERSION	v2
 BOOT_FROM	sd
-LOADER		mkimage.flash.mkimage	0x920000
+LOADER		mkimage.spl.mkimage	0x920000
diff --git a/doc/board/nxp/imx8mp_evk.rst b/doc/board/nxp/imx8mp_evk.rst
index 609a29f3ebc3..b996ae055e69 100644
--- a/doc/board/nxp/imx8mp_evk.rst
+++ b/doc/board/nxp/imx8mp_evk.rst
@@ -52,7 +52,6 @@  Burn the flash.bin to the MicroSD card at offset 32KB:
 .. code-block:: bash
 
    $sudo dd if=build/flash.bin of=/dev/sd[x] bs=1K seek=32 conv=notrunc; sync
-   $sudo dd if=build/u-boot.itb of=/dev/sd[x] bs=1K seek=384 conv=notrunc; sync
 
 Boot
 ----