From: Alice Guo <alice....@nxp.com>

i.MX95 B0 uses image container format v2 and needs DUMMY_DDR so that
update imximage.cfg and container.cfg for it.

Signed-off-by: Alice Guo <alice....@nxp.com>
---
 arch/arm/dts/imx95-u-boot.dtsi            |  8 ++++----
 arch/arm/mach-imx/imx9/Kconfig            |  1 +
 arch/arm/mach-imx/imx9/scmi/container.cfg |  1 +
 arch/arm/mach-imx/imx9/scmi/imximage.cfg  |  5 +++--
 doc/board/nxp/imx95_evk.rst               | 12 ++++++------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/arch/arm/dts/imx95-u-boot.dtsi b/arch/arm/dts/imx95-u-boot.dtsi
index 5ec3b1c51d6..9bf8f9834c9 100644
--- a/arch/arm/dts/imx95-u-boot.dtsi
+++ b/arch/arm/dts/imx95-u-boot.dtsi
@@ -22,12 +22,12 @@
                                type = "nxp-header-ddrfw";
 
                                imx-lpddr-imem {
-                                       filename = "lpddr5_imem_v202311.bin";
+                                       filename = "lpddr5_imem_v202409.bin";
                                        type = "blob-ext";
                                };
 
                                imx-lpddr-dmem {
-                                       filename = "lpddr5_dmem_v202311.bin";
+                                       filename = "lpddr5_dmem_v202409.bin";
                                        type = "blob-ext";
                                };
                        };
@@ -36,12 +36,12 @@
                                type = "nxp-header-ddrfw";
 
                                imx-lpddr-imem-qb {
-                                       filename = "lpddr5_imem_qb_v202311.bin";
+                                       filename = "lpddr5_imem_qb_v202409.bin";
                                        type = "blob-ext";
                                };
 
                                imx-lpddr-dmem-qb {
-                                       filename = "lpddr5_dmem_qb_v202311.bin";
+                                       filename = "lpddr5_dmem_qb_v202409.bin";
                                        type = "blob-ext";
                                };
                        };
diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig
index 280d255c086..81f75b92bbb 100644
--- a/arch/arm/mach-imx/imx9/Kconfig
+++ b/arch/arm/mach-imx/imx9/Kconfig
@@ -31,6 +31,7 @@ config IMX95
        select DM_MAILBOX
        select SCMI_FIRMWARE
        select SPL_IMX_CONTAINER_USE_TRAMPOLINE
+       select IMX_PQC_SUPPORT
 
 config SYS_SOC
        default "imx9"
diff --git a/arch/arm/mach-imx/imx9/scmi/container.cfg 
b/arch/arm/mach-imx/imx9/scmi/container.cfg
index 441d9beedd1..b25f3b726c5 100644
--- a/arch/arm/mach-imx/imx9/scmi/container.cfg
+++ b/arch/arm/mach-imx/imx9/scmi/container.cfg
@@ -3,6 +3,7 @@
  * Copyright 2025 NXP
  */
 
+CNTR_VERSION 2
 BOOT_FROM SD
 SOC_TYPE IMX9
 CONTAINER
diff --git a/arch/arm/mach-imx/imx9/scmi/imximage.cfg 
b/arch/arm/mach-imx/imx9/scmi/imximage.cfg
index 6af1c4ba628..c2c92174c1c 100644
--- a/arch/arm/mach-imx/imx9/scmi/imximage.cfg
+++ b/arch/arm/mach-imx/imx9/scmi/imximage.cfg
@@ -3,13 +3,14 @@
  * Copyright 2025 NXP
  */
 
+CNTR_VERSION 2
 BOOT_FROM SD
 SOC_TYPE IMX9
-APPEND mx95a0-ahab-container.img
+APPEND mx95b0-ahab-container.img
 CONTAINER
+DUMMY_DDR
 IMAGE OEI m33-oei-ddrfw.bin 0x1ffc0000
 HOLD 0x10000
-IMAGE OEI oei-m33-tcm.bin 0x1ffc0000
 IMAGE M33 m33_image.bin 0x1ffc0000
 IMAGE A55 spl/u-boot-spl.bin 0x20480000
 DUMMY_V2X 0x8b000000
diff --git a/doc/board/nxp/imx95_evk.rst b/doc/board/nxp/imx95_evk.rst
index 9121f7561ab..27cd15eb7c9 100644
--- a/doc/board/nxp/imx95_evk.rst
+++ b/doc/board/nxp/imx95_evk.rst
@@ -23,9 +23,9 @@ Note: srctree is U-Boot source directory
 
 .. code-block:: bash
 
-   $ wget 
https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-ele-imx-1.3.0-17945fc.bin
-   $ sh firmware-ele-imx-1.3.0-17945fc.bin --auto-accept
-   $ cp firmware-ele-imx-1.3.0-17945fc/mx95a0-ahab-container.img $(srctree)
+   $ wget 
https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-ele-imx-2.0.2-89161a8.bin
+   $ sh firmware-ele-imx-2.0.2-89161a8.bin --auto-accept
+   $ cp firmware-ele-imx-2.0.2-89161a8/mx95b0-ahab-container.img $(srctree)
 
 Get DDR PHY Firmware Images
 --------------------------------------
@@ -34,9 +34,9 @@ Note: srctree is U-Boot source directory
 
 .. code-block:: bash
 
-   $ wget 
https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.26-d4c33ab.bin
-   $ sh firmware-imx-8.26-d4c33ab.bin --auto-accept
-   $ cp firmware-imx-8.26-d4c33ab/firmware/ddr/synopsys/lpddr5*v202311.bin 
$(srctree)
+   $ wget 
https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.28-994fa14.bin
+   $ sh firmware-imx-8.28-994fa14.bin --auto-accept
+   $ cp firmware-imx-8.28-994fa14/firmware/ddr/synopsys/lpddr5*v202409.bin 
$(srctree)
 
 Get and Build OEI Images
 --------------------------------------

-- 
2.43.0

Reply via email to