[U-Boot] [PATCH 1/3] ARM: don't panic if no flash is there

Alessandro Rubini rubini-list at gnudd.com
Sun Apr 17 10:27:33 CEST 2011


From: Alessandro Rubini <rubini at gnudd.com>

Commit f1d2b313c9eb6808d30c16a9eb5251240452a56c, which
introduced relocation, also added some ifdef to panic
for no flash is found but some is expected.  This is policy,
in my opinion, and should not be part of the boot loader
like it wasn't there earlier.

This is mandatory to have the versatile port work on qemu,
where flash has never been correctly identified without any
side effect on the usefulness of the emulation.

Signed-off-by: Alessandro Rubini <rubini at gnudd.com>
---
 arch/arm/lib/board.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index dc46e21..bc8b589 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -431,10 +431,6 @@ void board_init_f (ulong bootflag)
 	/* NOTREACHED - relocate_code() does not return */
 }
 
-#if !defined(CONFIG_SYS_NO_FLASH)
-static char *failed = "*** failed ***\n";
-#endif
-
 /************************************************************************
  *
  * This is the next part if the initialization sequence: we are now
@@ -501,9 +497,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
 # else	/* !CONFIG_SYS_FLASH_CHECKSUM */
 		print_size (flash_size, "\n");
 # endif /* CONFIG_SYS_FLASH_CHECKSUM */
-	} else {
-		puts (failed);
-		hang ();
 	}
 #endif
 
-- 
1.5.6.5


More information about the U-Boot mailing list