summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorIan Campbell <ijc@hellion.org.uk>2014-07-21 19:23:18 +0100
committerTom Rini <trini@ti.com>2014-07-22 07:44:28 -0400
commit2c997e7a8f1d23513e6c63cd6519ed34133256ad (patch)
tree289d06981874b08152d2408a4b51122cecbc3321 /common
parente0ddcf93b93eb0bcd99501f90fd62e91c864e114 (diff)
downloadu-boot-imx-2c997e7a8f1d23513e6c63cd6519ed34133256ad.zip
u-boot-imx-2c997e7a8f1d23513e6c63cd6519ed34133256ad.tar.gz
u-boot-imx-2c997e7a8f1d23513e6c63cd6519ed34133256ad.tar.bz2
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 <ijc@hellion.org.uk> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 602a239..4479acb 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)