diff mbox series

imx8mn-ddr4-evk: generate single bootable image

Message ID 20220117220407.769-1-andrey.zhizhikin@leica-geosystems.com
State Accepted
Commit 94588ff395317a9203e2dd04b650cc40d27bc5c3
Delegated to: Stefano Babic
Headers show
Series imx8mn-ddr4-evk: generate single bootable image | expand

Commit Message

ZHIZHIKIN Andrey Jan. 17, 2022, 10:04 p.m. UTC
As suggested in commit 028abfd9b157 ("imx8mm-evk: Generate a single
bootable flash.bin again") for imx8mm_evk, it is possible to produce
single bootable image via binman. This restores the original behavior in
distros, where only one boot container is used to create target image.

Perform similar adaptions in order to provide single bootable image for
imx8mn-ddr4-evk derivate.

Update documentation to drop additional step of copying u-boot.itb

Fixes: 353dfe4b4359 ("imx8mn-ddr4-evk: switch to use binman")
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
---
 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi      | 19 ++++++++++++++++++-
 .../imx8mn_evk/imximage-8mn-ddr4.cfg          |  2 +-
 doc/board/nxp/imx8mn_evk.rst                  |  1 -
 3 files changed, 19 insertions(+), 3 deletions(-)


base-commit: 4e81f3be340072ad2c0aac093677333702f14f22

Comments

Fabio Estevam Jan. 18, 2022, 11:52 a.m. UTC | #1
On Mon, Jan 17, 2022 at 7:04 PM Andrey Zhizhikin
<andrey.zhizhikin@leica-geosystems.com> wrote:
>
> As suggested in commit 028abfd9b157 ("imx8mm-evk: Generate a single
> bootable flash.bin again") for imx8mm_evk, it is possible to produce
> single bootable image via binman. This restores the original behavior in
> distros, where only one boot container is used to create target image.
>
> Perform similar adaptions in order to provide single bootable image for
> imx8mn-ddr4-evk derivate.
>
> Update documentation to drop additional step of copying u-boot.itb
>
> Fixes: 353dfe4b4359 ("imx8mn-ddr4-evk: switch to use binman")
> Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Stefano Babic Feb. 5, 2022, 4:44 p.m. UTC | #2
> As suggested in commit 028abfd9b157 ("imx8mm-evk: Generate a single
> bootable flash.bin again") for imx8mm_evk, it is possible to produce
> single bootable image via binman. This restores the original behavior in
> distros, where only one boot container is used to create target image.
> Perform similar adaptions in order to provide single bootable image for
> imx8mn-ddr4-evk derivate.
> Update documentation to drop additional step of copying u-boot.itb
> Fixes: 353dfe4b4359 ("imx8mn-ddr4-evk: switch to use binman")
> Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
index 1d3844437d..2e39790766 100644
--- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
@@ -157,7 +157,9 @@ 
 	};
 
 
-	flash {
+	spl {
+		filename = "spl.bin";
+
 		mkimage {
 			args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
 
@@ -224,4 +226,19 @@ 
 			};
 		};
 	};
+
+	imx-boot {
+		filename = "flash.bin";
+		pad-byte = <0x00>;
+
+		spl: blob-ext@1 {
+			offset = <0x0>;
+			filename = "spl.bin";
+		};
+
+		uboot: blob-ext@2 {
+			offset = <0x58000>;
+			filename = "u-boot.itb";
+		};
+	};
 };
diff --git a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg b/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg
index 22aec26da7..7286b26494 100644
--- a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg
+++ b/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg
@@ -7,4 +7,4 @@ 
 
 ROM_VERSION	v2
 BOOT_FROM	sd
-LOADER		mkimage.flash.mkimage	0x912000
+LOADER		u-boot-spl-ddr.bin	0x912000
diff --git a/doc/board/nxp/imx8mn_evk.rst b/doc/board/nxp/imx8mn_evk.rst
index 9fbb947032..711545af89 100644
--- a/doc/board/nxp/imx8mn_evk.rst
+++ b/doc/board/nxp/imx8mn_evk.rst
@@ -50,7 +50,6 @@  Burn the flash.bin to MicroSD card offset 32KB:
 .. code-block:: bash
 
    $sudo dd if=flash.bin of=/dev/sd[x] bs=1024 seek=32 conv=notrunc
-   $sudo dd if=u-boot.itb of=/dev/sd[x] bs=1024 seek=384 conv=notrunc
 
 Boot
 ----