From 70879a92561abd300e9e84b25fff841bb3b34837 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 5 Dec 2014 12:20:58 +0900 Subject: [PATCH] flash: do not fail even if flash_size is zero CONFIG_SYS_MAX_FLASH_BANKS_DETECT allows to determine the number of flash banks at run-time, that is, there is a possibility that no flash bank is found. Even in such cases, it makes sense to continue the boot process without any flash device. Signed-off-by: Masahiro Yamada Acked-by: Stefan Roese --- common/board_r.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 1b8998d093..6e597127a2 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -291,26 +291,14 @@ static int initr_flash(void) { ulong flash_size = 0; bd_t *bd = gd->bd; - int ok; puts("Flash: "); - if (board_flash_wp_on()) { + if (board_flash_wp_on()) printf("Uninitialized - Write Protect On\n"); - /* Since WP is on, we can't find real size. Set to 0 */ - ok = 1; - } else { + else flash_size = flash_init(); - ok = flash_size > 0; - } - if (!ok) { - puts("*** failed ***\n"); -#ifdef CONFIG_PPC - /* Why does PPC do this? */ - hang(); -#endif - return -1; - } + print_size(flash_size, ""); #ifdef CONFIG_SYS_FLASH_CHECKSUM /* -- 2.25.1