diff options
author | Roger Quadros <rogerq@ti.com> | 2014-09-23 18:07:02 +0300 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-10-10 09:44:42 -0400 |
commit | 3160b1b98603cba3c480f70e153b259171d3e4a6 (patch) | |
tree | 7182e26da28c6f6ba9f55ce4b4706c61cb28bdac | |
parent | 02590aa31cc282cffafac559032981094f716fa9 (diff) | |
download | u-boot-imx-3160b1b98603cba3c480f70e153b259171d3e4a6.zip u-boot-imx-3160b1b98603cba3c480f70e153b259171d3e4a6.tar.gz u-boot-imx-3160b1b98603cba3c480f70e153b259171d3e4a6.tar.bz2 |
OMAP5+: sata/scsi: Implement scsi_init()
On OMAP platforms, SATA controller provides the SCSI subsystem
so implement scsi_init().
Get rid of the unnecessary sata_init() call from dra7xx-evm
and omap5-uevm board files.
Signed-off-by: Roger Quadros <rogerq@ti.com>
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/sata.c | 6 | ||||
-rw-r--r-- | board/ti/dra7xx/evm.c | 1 | ||||
-rw-r--r-- | board/ti/omap5_uevm/evm.c | 6 | ||||
-rw-r--r-- | include/configs/omap5_uevm.h | 1 |
4 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/sata.c b/arch/arm/cpu/armv7/omap-common/sata.c index cad4fee..131d082 100644 --- a/arch/arm/cpu/armv7/omap-common/sata.c +++ b/arch/arm/cpu/armv7/omap-common/sata.c @@ -74,3 +74,9 @@ int init_sata(int dev) return ret; } + +/* On OMAP platforms SATA provides the SCSI subsystem */ +void scsi_init(void) +{ + init_sata(0); +} diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 5592fc5..37df7b2 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -93,7 +93,6 @@ int board_late_init(void) else setenv("board_name", "dra7xx"); #endif - init_sata(0); return 0; } diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 4666b38..833ffe9 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -69,12 +69,6 @@ int board_init(void) return 0; } -int board_late_init(void) -{ - init_sata(0); - return 0; -} - int board_eth_init(bd_t *bis) { return 0; diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 7e2ecd5..e8dc462 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -72,7 +72,6 @@ /* Max time to hold reset on this board, see doc/README.omap-reset-time */ #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296 -#define CONFIG_BOARD_LATE_INIT #define CONFIG_CMD_SCSI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI |