diff mbox series

[U-Boot,V2,7/9] spl: nand: support loading i.MX container format file

Message ID 20190923021848.12500-7-peng.fan@nxp.com
State Accepted
Commit 00e180cc513ee8ea4f2a3c17758772e710deb4df
Delegated to: Stefano Babic
Headers show
Series [U-Boot,V2,1/9] spl: mmc: introduce spl_mmc_get_uboot_raw_sector | expand

Commit Message

Peng Fan Sept. 23, 2019, 2:18 a.m. UTC 
From: Peng Fan <peng.fan@nxp.com>

i.MX8 only support AHAB secure boot with Container format image,
we could not use FIT to support secure boot, so introduce container
support to let SPL could load container images.

Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Cc: Tien Fong Chee <tien.fong.chee@intel.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Alex Kiernan <alex.kiernan@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Cc: Kever Yang <kever.yang@rock-chips.com>
Cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

V2:
 New

 common/spl/spl_nand.c | 9 +++++++++
 1 file changed, 9 insertions(+)
diff mbox series

Patch

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index d3185dc017..5f8a111a2f 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -68,6 +68,15 @@  static int spl_nand_load_element(struct spl_image_info *spl_image,
 		load.bl_len = 1;
 		load.read = spl_nand_fit_read;
 		return spl_load_simple_fit(spl_image, &load, offset, header);
+	} else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
+		struct spl_load_info load;
+
+		load.dev = NULL;
+		load.priv = NULL;
+		load.filename = NULL;
+		load.bl_len = 1;
+		load.read = spl_nand_fit_read;
+		return spl_load_imx_container(spl_image, &load, offset);
 	} else {
 		err = spl_parse_image_header(spl_image, header);
 		if (err)