imx: imx8qxp: imx8qxp_mek switch to binman

Switch to use binman pack images

Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi
index ae037c7550df5b7256e345fcc7c1a4ee98244249..17f44e1ce7eef2df544bd1e11b1855d6d55ef577 100644 (file)
--- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi
@@ -3,6 +3,8 @@
  * Copyright 2018, 2021 NXP
  */
 
+#include "imx8qxp-u-boot.dtsi"
+
 &{/imx8qx-pm} {
 
        u-boot,dm-spl;

diff --git a/arch/arm/dts/imx8qxp-u-boot.dtsi b/arch/arm/dts/imx8qxp-u-boot.dtsi
new file mode 100644 (file)
index 0000000..01183f8
--- /dev/null
+++ b/arch/arm/dts/imx8qxp-u-boot.dtsi
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018, 2021 NXP
+ */
+
+/ {
+       binman: binman {
+               multiple-images;
+       };
+};
+
+&binman {
+#ifdef CONFIG_SPL
+       u-boot-spl-ddr {
+               align = <4>;
+               align-size = <4>;
+               filename = "u-boot-spl-ddr.bin";
+               pad-byte = <0xff>;
+
+               u-boot-spl {
+                       align-end = <4>;
+                       filename = "u-boot-spl.bin";
+               };
+       };
+
+       spl {
+               filename = "spl.bin";
+
+               mkimage {
+                       args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x100000";
+
+                       blob {
+                               filename = "u-boot-spl-ddr.bin";
+                       };
+               };
+       };
+#endif
+
+       itb {
+               filename = "u-boot.itb";
+
+               fit {
+                       description = "Configuration to load ATF before U-Boot";
+                       fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+                       fit,fdt-list = "of-list";
+                       #address-cells = <1>;
+
+                       images {
+                               uboot {
+                                       arch = "arm64";
+                                       compression = "none";
+                                       description = "U-Boot (64-bit)";
+                                       load = <CONFIG_SYS_TEXT_BASE>;
+                                       type = "standalone";
+
+                                       uboot-blob {
+                                               filename = "u-boot-nodtb.bin";
+                                               type = "blob-ext";
+                                       };
+                               };
+
+                               atf {
+                                       arch = "arm64";
+                                       compression = "none";
+                                       description = "ARM Trusted Firmware";
+                                       entry = <0x00910000>;
+                                       load =  <0x00091000>;
+                                       type = "firmware";
+
+                                       atf-blob {
+                                               filename = "bl31.bin";
+                                               type = "atf-bl31";
+                                       };
+                               };
+
+                               scfw {
+                                       arch = "arm64";
+                                       compression = "none";
+                                       description = "System Controler Firmware";
+                                       type = "firmware";
+
+                                       scfw_blob {
+                                               filename = "mx8qx-mek-scfw-tcm.bin";
+                                               type = "blob-ext";
+                                       };
+                               };
+
+                               seco {
+                                       arch = "arm64";
+                                       compression = "none";
+                                       description = "Seco Firmware";
+                                       type = "firmware";
+
+                                       seco_blob {
+                                               filename = "mx8qxc0-ahab-container.img";
+                                               type = "blob-ext";
+                                       };
+                               };
+
+                               fdt {
+                                       type = "flat_dt";
+                                       compression = "none";
+
+                                       uboot-fdt-blob {
+                                               filename = "u-boot.dtb";
+                                               type = "blob-ext";
+                                       };
+                               };
+                       };
+
+                       configurations {
+                               default = "conf";
+
+                               conf {
+                                       fdt = "fdt";
+                                       firmware = "uboot";
+                                       loadables = "atf";
+                               };
+                       };
+               };
+       };
+
+       imx-boot {
+               filename = "flash.bin";
+               pad-byte = <0x00>;
+
+               spl {
+                       filename = "spl.bin";
+                       offset = <0x0>;
+                       type = "blob-ext";
+               };
+       };
+};

diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index d423cf8563f26180741314f001a4c32a3e3f5929..23a7fcf3613b47e5e7f0e9c7e71bef7f611d724e 100644 (file)
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -90,6 +90,7 @@ config TARGET_IMX8QM_ROM7720_A1
 
 config TARGET_IMX8QXP_MEK
        bool "Support i.MX8QXP MEK board"
+       select BINMAN
        select BOARD_LATE_INIT
        select IMX8QXP
        select FSL_CAAM

diff --git a/board/freescale/imx8qxp_mek/imximage.cfg b/board/freescale/imx8qxp_mek/imximage.cfg
index 89a4736ab7a661c896e2cdc496b23bf39e142faf..88d6955a9ef3b9787314d6c917e5b341dd96a9e9 100644 (file)
--- a/board/freescale/imx8qxp_mek/imximage.cfg
+++ b/board/freescale/imx8qxp_mek/imximage.cfg
@@ -7,8 +7,7 @@
  */
 
 
-/* Boot from SD, sector size 0x400 */
-BOOT_FROM SD 0x400
+BOOT_FROM      sd
 /* SoC type IMX8QX */
 SOC_TYPE IMX8QX
 /* Append seco container image */

diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig
index 3865eb393f5d9a53d53859421dbf0c9dac18b196..a00951a3b03045dd4a807b682c0ddc0f3a953212 100644 (file)
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -23,6 +23,8 @@ CONFIG_SYS_LOAD_ADDR=0x80280000
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_REMAKE_ELF=y
+CONFIG_FIT=y
+CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_BOOTDELAY=3

diff --git a/doc/board/nxp/imx8qxp_mek.rst b/doc/board/nxp/imx8qxp_mek.rst
index 215627cfa6d24d1b1c1c61fd9c6fd9264bebf85b..708db1952e9375eae9f06c3074923ed55a44d939 100644 (file)
--- a/doc/board/nxp/imx8qxp_mek.rst
+++ b/doc/board/nxp/imx8qxp_mek.rst
@@ -50,7 +50,7 @@ Build U-Boot
 .. code-block:: bash
 
   $ make imx8qxp_mek_defconfig
-  $ make flash.bin
+  $ make
 
 Flash the binary into the SD card
 ---------------------------------