From 1ff51e887a07a0f2426e5111df683ce2a9d4097d Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Mon, 1 Dec 2014 15:30:01 -0800 Subject: [PATCH] exynos: return correct value when init_default_cbfs_media fails BUG=none BRANCH=ToT TEST=Built daisy. Signed-off-by: Daisuke Nojiri Change-Id: Id6e006be1db08933dc97b5e797a85f3cbf9f6486 Reviewed-on: https://chromium-review.googlesource.com/232513 Reviewed-by: Julius Werner --- src/include/cbfs.h | 6 +++++- src/soc/samsung/exynos5250/alternate_cbfs.c | 2 +- src/soc/samsung/exynos5420/alternate_cbfs.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/include/cbfs.h b/src/include/cbfs.h index 8adb7e166b..01117e016e 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -84,7 +84,11 @@ struct lb_memory; void *selfload(struct lb_memory *mem, struct cbfs_payload *payload); void selfboot(void *entry); -/* Defined in individual arch / board implementation. */ +/* + * Defined in individual arch / board implementation. + * + * it returns 0 on success and non-zero on error. + */ int init_default_cbfs_media(struct cbfs_media *media); #if CONFIG_RELOCATABLE_RAMSTAGE && defined(__ROMSTAGE__) diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c index 93a3363b4f..9f873bff9f 100644 --- a/src/soc/samsung/exynos5250/alternate_cbfs.c +++ b/src/soc/samsung/exynos5250/alternate_cbfs.c @@ -171,6 +171,6 @@ int init_default_cbfs_media(struct cbfs_media *media) default: printk(BIOS_EMERG, "Exynos OM_STAT value 0x%x not supported!\n", exynos_power->om_stat); - return 0; + return 1; } } diff --git a/src/soc/samsung/exynos5420/alternate_cbfs.c b/src/soc/samsung/exynos5420/alternate_cbfs.c index 9ac0e2478e..45489f1e19 100644 --- a/src/soc/samsung/exynos5420/alternate_cbfs.c +++ b/src/soc/samsung/exynos5420/alternate_cbfs.c @@ -178,6 +178,6 @@ int init_default_cbfs_media(struct cbfs_media *media) default: printk(BIOS_EMERG, "Exynos OM_STAT value 0x%x not supported!\n", exynos_power->om_stat); - return 0; + return 1; } }