From 2c997e7a8f1d23513e6c63cd6519ed34133256ad Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 21 Jul 2014 19:23:18 +0100 Subject: [PATCH] board_r: run scsi init() on ARM too This has been disabled for ARM in initr_scsi since that function was introduced. However it works fine for me on Cubieboard and Cubietruck (with the upcoming AHCI glue patch). I also tested on two random ARM platforms which seem to define CONFIG_CMD_SCSI: - highbank worked fine (on midway hardware) - omap5_uevm built OK and I confirmed using objdump that things were as expected (i.e. the default weak scsi_init nop was used). While there remove the mismatched comment from the #endif (omitting the comment seems to be the prevailing style in this file). Signed-off-by: Ian Campbell Acked-by: Simon Glass --- common/board_r.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 602a239380..4479acbb72 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -588,15 +588,12 @@ static int initr_status_led(void) #if defined(CONFIG_CMD_SCSI) static int initr_scsi(void) { - /* Not supported properly on ARM yet */ -#ifndef CONFIG_ARM puts("SCSI: "); scsi_init(); -#endif return 0; } -#endif /* CONFIG_CMD_NET */ +#endif #if defined(CONFIG_CMD_DOC) static int initr_doc(void) -- 2.25.1