aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeng Fan <peng.fan@nxp.com>2019-09-23 10:18:46 +0800
committerStefano Babic <sbabic@denx.de>2019-10-08 16:36:36 +0200
commit00e180cc513ee8ea4f2a3c17758772e710deb4df (patch)
tree30514da3c9197c4cb632294a6ebe1d7bb62ec6d5
parent62f0bfc016d25d22425fc24cd34684d8030f919b (diff)
downloadu-boot-00e180cc513ee8ea4f2a3c17758772e710deb4df.zip
u-boot-00e180cc513ee8ea4f2a3c17758772e710deb4df.tar.gz
u-boot-00e180cc513ee8ea4f2a3c17758772e710deb4df.tar.bz2
spl: nand: support loading i.MX container format file
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>
-rw-r--r--common/spl/spl_nand.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index d3185dc..5f8a111 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)