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 <[email protected]>
---
 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 {
                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
 ----
-- 
2.25.1

Reply via email to