From c19a28bc65aa27fe143e3c784d4f2e19e08810bf Mon Sep 17 00:00:00 2001 From: Alex G Date: Tue, 8 Nov 2016 20:48:44 -0800 Subject: [PATCH] board: am335x/mux: Do not hang when encountering a bad EEPROM In most cases, the SPL and u-boot.img will be on the same boot media. Since the SPL was loaded by the boot rom, the pinmux will already have been configured for this media. This, the board will still be able to boot successfully, or at least reach the u-boot console, where more recovery options are available. I've encountered this on a beaglebone black with a corrupted EEPROM. Removing this check allowed the board to boot successfully. I've also seen this on EVM-based boards with an unprogrammed EEPROM. On those boards, for some reason there were no UART messages. This made it look as if the SOC was dead. Remove the hang(), as it is not a fatal error. Also reformat the error message to be clearer as to the cause. The original message made it appear as if the wrong binary was being loaded. Signed-off-by: Alexandru Gagniuc Reviewed-by: Tom Rini --- board/ti/am335x/mux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 8afa5f9b40..ad85b3a19a 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -397,7 +397,7 @@ void enable_board_pin_mux(void) configure_module_pin_mux(rmii1_pin_mux); configure_module_pin_mux(spi0_pin_mux); } else { - puts("Unknown board, cannot configure pinmux."); - hang(); + /* Unknown board. We might still be able to boot. */ + puts("Bad EEPROM or unknown board, cannot configure pinmux."); } } -- 2.39.5