From patchwork Fri Jul 4 19:05:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pekon gupta X-Patchwork-Id: 367202 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 0BEE61400A3 for ; Sat, 5 Jul 2014 05:06:40 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A06544B164; Fri, 4 Jul 2014 21:06:38 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Iu4yEnbi6S-E; Fri, 4 Jul 2014 21:06:38 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2EB9D4B174; Fri, 4 Jul 2014 21:06:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5AE024A056 for ; Fri, 4 Jul 2014 21:06:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wETrrSXAxP72 for ; Fri, 4 Jul 2014 21:06:19 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by theia.denx.de (Postfix) with ESMTPS id AB43A4A049 for ; Fri, 4 Jul 2014 21:06:16 +0200 (CEST) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s64J65QT032663; Fri, 4 Jul 2014 14:06:05 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s64J65vV013130; Fri, 4 Jul 2014 14:06:05 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Fri, 4 Jul 2014 14:06:05 -0500 Received: from psplinux063.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s64J5tD7032459; Fri, 4 Jul 2014 14:06:03 -0500 From: Pekon Gupta To: Scott Wood , Tom Rini Date: Sat, 5 Jul 2014 00:35:13 +0530 Message-ID: <1404500717-775-4-git-send-email-pekon@ti.com> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1404500717-775-1-git-send-email-pekon@ti.com> References: <1404500717-775-1-git-send-email-pekon@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Enric Balletbo Serra , Felten , Lothar@theia.denx.de Subject: [U-Boot] [PATCH v1 3/7] arm: lib: continue board_init_r even if valid flash device is not detected X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@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