diff mbox

[U-Boot,2/3] board_r: run scsi init() on ARM too

Message ID 1405966998.27009.53.camel@dagon.hellion.org.uk
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Ian Campbell July 21, 2014, 6:23 p.m. UTC 
On Fri, 2014-07-18 at 21:12 -0600, Simon Glass wrote:
> 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.

I've just sent that out. So here is v3 of this patch. I noticed that you
acked v1 and I failed to pick that up so I've taken the liberty of
adding it here after removing the initr_doc change -- I hope that was
OK.

8<-------------------------

From dfbcd187178e3b15504657ebdb434ead4d417f2e Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Wed, 7 May 2014 19:54:05 +0100
Subject: [PATCH v3] 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>
---
 common/board_r.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Tom Rini July 22, 2014, 7:24 p.m. UTC | #1 
On Mon, Jul 21, 2014 at 07:23:18PM +0100, Ian Campbell wrote:

> Subject: [PATCH v3] 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

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)