From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Date: Sat, 31 May 2014 17:36:12 +0100 Subject: [U-Boot] [PATCH 2/5] board_r: run scsi init() on ARM too In-Reply-To: <1401554145.15871.100.camel@hastur.hellion.org.uk> References: <1401554145.15871.100.camel@hastur.hellion.org.uk> Message-ID: <1401554175-29599-2-git-send-email-ijc@hellion.org.uk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 Cc: Simon Glass --- common/board_r.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 -- 1.9.0