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>
master
Ian Campbell 10 years ago committed by Tom Rini
parent e0ddcf93b9
commit 2c997e7a8f
  1. 5
      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)

Loading…
Cancel
Save