diff options
| author | Tom Rini <trini@ti.com> | 2014-12-08 16:35:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-08 16:35:05 -0500 |
| commit | 0fffbd26d55d89ec5241f8e1ce4c5bc77892678b (patch) | |
| tree | e483ead53c177a3e8ad3d6563a893623859c40e3 /common | |
| parent | 1a9c8f12f2f2824a047ebeb3ae342109677b48cc (diff) | |
| parent | 7a3620b24649663857d99e8ab73ec0b3bd60e50e (diff) | |
| download | u-boot-imx-0fffbd26d55d89ec5241f8e1ce4c5bc77892678b.zip u-boot-imx-0fffbd26d55d89ec5241f8e1ce4c5bc77892678b.tar.gz u-boot-imx-0fffbd26d55d89ec5241f8e1ce4c5bc77892678b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/common/board_r.c b/common/board_r.c index 1ef79ce..4eb7a02 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 /* |