summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/imx8/parser.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx8/parser.c b/arch/arm/mach-imx/imx8/parser.c
index 7ddb1702bf..4cef7f0fb3 100644
--- a/arch/arm/mach-imx/imx8/parser.c
+++ b/arch/arm/mach-imx/imx8/parser.c
@@ -26,6 +26,11 @@
DECLARE_GLOBAL_DATA_PTR;
+#if defined(CONFIG_IMX_TRUSTY_OS)
+/* Pre-declaration of check_rpmb_blob. */
+int check_rpmb_blob(struct mmc *mmc);
+#endif
+
static int current_dev_type = MMC_DEV;
static int start_offset;
static void *device;
@@ -228,7 +233,14 @@ int mmc_load_image_parse_container(struct spl_image_info *spl_image,
ret = read_auth_container(spl_image);
+ if (ret)
+ return ret;
+
+ /* Images loaded, now check the rpmb keyblob for Trusty OS. */
+#if defined(CONFIG_IMX_TRUSTY_OS)
+ ret = check_rpmb_blob(mmc);
return ret;
+#endif
}
int spi_load_image_parse_container(struct spl_image_info *spl_image,