Commit c630e0ad3bc87f962ba7ce6038a78d99b9d1ff5c

Authored by faqiang.zhu
1 parent cd11afb01f

MA-13588 Fix build warning caused by previous android SPL+CONTAINER patch

compile waring info is as below:
	arch/arm/mach-imx/imx8/parser.c: In function ‘mmc_load_image_parse_container’:
	arch/arm/mach-imx/imx8/parser.c:244:1: warning: control reaches end of non-void function [-Wreturn-type]
	}
	^

previouse patch change ID:
I40a791d5b5b1eba6a0170d6853626fb546be4b2c

Change-Id: Ia605df11beab42e720fff6442a11b1e4b25ac209
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>

Showing 2 changed files with 7 additions and 7 deletions Side-by-side Diff

arch/arm/mach-imx/imx8/parser.c
... ... @@ -233,14 +233,14 @@
233 233  
234 234 ret = read_auth_container(spl_image);
235 235  
236   - if (ret)
237   - return ret;
238   -
239   - /* Images loaded, now check the rpmb keyblob for Trusty OS. */
  236 + if (!ret)
  237 + {
  238 + /* Images loaded, now check the rpmb keyblob for Trusty OS. */
240 239 #if defined(CONFIG_IMX_TRUSTY_OS)
241   - ret = check_rpmb_blob(mmc);
242   - return ret;
  240 + ret = check_rpmb_blob(mmc);
243 241 #endif
  242 + }
  243 + return ret;
244 244 }
245 245  
246 246 int spi_load_image_parse_container(struct spl_image_info *spl_image,
common/spl/spl_mmc.c
... ... @@ -112,7 +112,7 @@
112 112 #if defined(CONFIG_IMX_TRUSTY_OS) && defined(CONFIG_ANDROID_AUTO_SUPPORT)
113 113 ret = check_rpmb_blob(mmc);
114 114 #endif
115   - return 0;
  115 + return ret;
116 116 }
117 117  
118 118 #endif /* CONFIG_DUAL_BOOTLOADER */