From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pekon Gupta Date: Sat, 5 Jul 2014 00:35:13 +0530 Subject: [U-Boot] [PATCH v1 3/7] arm: lib: continue board_init_r even if valid flash device is not detected In-Reply-To: <1404500717-775-1-git-send-email-pekon@ti.com> References: <1404500717-775-1-git-send-email-pekon@ti.com> Message-ID: <1404500717-775-4-git-send-email-pekon@ti.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Most platforms have fall-back boot sources, if their primary boot fails. This patch allows board_init to continue scanning through other secondary boot sources like NAND, MMC, etc if valid FLASH device is not detected. Signed-off-by: Pekon Gupta --- arch/arm/lib/board.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 76adaf3..413ee60 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -460,10 +460,6 @@ void board_init_f(ulong bootflag) memcpy(id, (void *)gd, sizeof(gd_t)); } -#if !defined(CONFIG_SYS_NO_FLASH) -static char *failed = "*** failed ***\n"; -#endif - /* * Tell if it's OK to load the environment early in boot. * @@ -574,8 +570,7 @@ void board_init_r(gd_t *id, ulong dest_addr) print_size(flash_size, "\n"); # endif /* CONFIG_SYS_FLASH_CHECKSUM */ } else { - puts(failed); - hang(); + puts("unable to detect valid flash device\n"); } #endif -- 1.8.5.1.163.gd7aced9