arm64: dts: imx8mm: Generate FSPI header using binman imx8mimage

The binman imx8mimage now correctly handles generated fspi_header.bin
in its imx8mimage etype. Make use of this, remove fspi_conf_block in
favor of generated fspi_header.bin, and configure imx8mimage accordingly.

Signed-off-by: Marek Vasut <marex@nabladev.com>

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index d891e8062fe557d6855f07078918b56e23e4c053..ab135fc8a47824dc3e69174fee8b1d60997ddc88 100644 (file)
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -50,14 +50,6 @@
        section {
                pad-byte = <0x00>;
 
-#ifdef CONFIG_FSPI_CONF_HEADER
-               fspi_conf_block {
-                       filename = CONFIG_FSPI_CONF_FILE;
-                       type = "blob-ext";
-                       size = <0x1000>;
-               };
-#endif
-
 #ifdef CONFIG_IMX_HAB
                nxp-imx8mcst@0 {
                        filename = "u-boot-spl-mkimage.signed.bin";
@@ -68,7 +60,12 @@
 
                        binman_imx_spl: nxp-imx8mimage {
                                filename = "u-boot-spl-mkimage.bin";
+#ifdef CONFIG_FSPI_CONF_HEADER
+                               nxp,boot-from = "fspi";
+                               nxp,fspi-header-filename = CONFIG_FSPI_CONF_FILE;
+#else
                                nxp,boot-from = "sd";
+#endif
                                nxp,rom-version = <1>;
                                nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
                                args;   /* Needed by mkimage etype superclass */