From e1298dfa0727e0814855d26b080debca107195b1 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. Change-Id: I64033f8e7beb247b2b8bd66e58de6c5e263ee634 Signed-off-by: Patrick Georgi Original-Commit-Id: 1ff51e887a07a0f2426e5111df683ce2a9d4097d Original-Signed-off-by: Daisuke Nojiri Original-Change-Id: Id6e006be1db08933dc97b5e797a85f3cbf9f6486 Original-Reviewed-on: https://chromium-review.googlesource.com/232513 Original-Reviewed-by: Julius Werner Reviewed-on: http://review.coreboot.org/9735 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/include/cbfs.h | 7 ++++++- src/soc/samsung/exynos5250/alternate_cbfs.c | 2 +- src/soc/samsung/exynos5420/alternate_cbfs.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/include/cbfs.h b/src/include/cbfs.h index fcc55b5f67..c46d2a0be3 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -76,7 +76,12 @@ void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer, void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer, const void *address); -/* 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); #endif 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; } }