| Message ID | 1405712321-12334-2-git-send-email-ijc@hellion.org.uk |
|---|---|
| State | Changes Requested |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Ian, On 18 July 2014 13:38, Ian Campbell <ijc@hellion.org.uk> wrote: > > 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) and add a missing return to > initr_doc which I happened to spot while editing. That's great, but I think the latter should be a separate patch. Regards, Simon
diff --git a/common/board_r.c b/common/board_r.c index 602a239..427ee67 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -588,21 +588,19 @@ 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) { puts("DOC: "); doc_init(); + return 0 } #endif
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) and add a missing return to initr_doc which I happened to spot while editing. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Cc: Simon Glass <sjg@chromium.org> --- common/board_r.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)