Commit 70879a92 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: default avatarStefan Roese <sr@denx.de>
parent 9248a78f
......@@ -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
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment