diff options
| author | faqiang.zhu <faqiang.zhu@nxp.com> | 2018-11-28 11:01:27 +0800 |
|---|---|---|
| committer | faqiang.zhu <faqiang.zhu@nxp.com> | 2018-11-28 12:00:41 +0800 |
| commit | c258131f4998a7c8a6e6fca230ca9e7f8f6677eb (patch) | |
| tree | 51f3595f1b05e7986010738a6a54425136d4a6b3 | |
| parent | 6dffe1931ecc355c066f803bf64d1e1dca7f036b (diff) | |
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>
| -rw-r--r-- | arch/arm/mach-imx/imx8/parser.c | 12 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/imx8/parser.c b/arch/arm/mach-imx/imx8/parser.c index 4cef7f0fb33..6c23565636e 100644 --- a/arch/arm/mach-imx/imx8/parser.c +++ b/arch/arm/mach-imx/imx8/parser.c @@ -233,14 +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 (!ret) + { + /* Images loaded, now check the rpmb keyblob for Trusty OS. */ #if defined(CONFIG_IMX_TRUSTY_OS) - ret = check_rpmb_blob(mmc); - return ret; + ret = check_rpmb_blob(mmc); #endif + } + return ret; } int spi_load_image_parse_container(struct spl_image_info *spl_image, diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index ec56f11fdb1..ae599918244 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -112,7 +112,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image, #if defined(CONFIG_IMX_TRUSTY_OS) && defined(CONFIG_ANDROID_AUTO_SUPPORT) ret = check_rpmb_blob(mmc); #endif - return 0; + return ret; } #endif /* CONFIG_DUAL_BOOTLOADER */ |