| Message ID | 1391432342-12723-2-git-send-email-dmurphy@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On 02/03/2014 02:59 PM, Dan Murphy wrote: > Add the SATA boot support for OMAP5 and dra7xx. > > Renamed the omap_sata_init to the common init_sata(int dev) > for commonality in with sata stack. > > Added the ROM boot device ID for SATA. > > Signed-off-by: Dan Murphy <dmurphy@ti.com> Reviewed-by: Roger Quadros <rogerq@ti.com> cheers, -roger
Bump On 02/07/2014 03:42 AM, Roger Quadros wrote: > On 02/03/2014 02:59 PM, Dan Murphy wrote: >> Add the SATA boot support for OMAP5 and dra7xx. >> >> Renamed the omap_sata_init to the common init_sata(int dev) >> for commonality in with sata stack. >> >> Added the ROM boot device ID for SATA. >> >> Signed-off-by: Dan Murphy <dmurphy@ti.com> > Reviewed-by: Roger Quadros <rogerq@ti.com> > > cheers, > -roger
On Mon, Feb 03, 2014 at 06:59:02AM -0600, Dan Murphy wrote: > Add the SATA boot support for OMAP5 and dra7xx. > > Renamed the omap_sata_init to the common init_sata(int dev) > for commonality in with sata stack. > > Added the ROM boot device ID for SATA. > > Signed-off-by: Dan Murphy <dmurphy@ti.com> > Reviewed-by: Roger Quadros <rogerq@ti.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv7/omap-common/sata.c b/arch/arm/cpu/armv7/omap-common/sata.c index f5468c4..cad4fee 100644 --- a/arch/arm/cpu/armv7/omap-common/sata.c +++ b/arch/arm/cpu/armv7/omap-common/sata.c @@ -12,6 +12,7 @@ #include <scsi.h> #include <asm/arch/clock.h> #include <asm/arch/sata.h> +#include <sata.h> #include <asm/io.h> #include "pipe3-phy.h" @@ -31,7 +32,7 @@ struct omap_pipe3 sata_phy = { .dpll_map = dpll_map_sata, }; -int omap_sata_init(void) +int init_sata(int dev) { int ret; u32 val; diff --git a/arch/arm/include/asm/arch-omap5/sata.h b/arch/arm/include/asm/arch-omap5/sata.h index 2ca8947..b69165b 100644 --- a/arch/arm/include/asm/arch-omap5/sata.h +++ b/arch/arm/include/asm/arch-omap5/sata.h @@ -36,13 +36,4 @@ #define TI_SATA_IDLE_SMART_WAKE (0x3 << 2) #define TI_SATA_IDLE_SMART (0x2 << 2) -#ifdef CONFIG_SCSI_AHCI_PLAT -int omap_sata_init(void); -#else -static inline int omap_sata_init(void) -{ - return 0; -} -#endif /* CONFIG_SCSI_AHCI_PLAT */ - #endif /* _TI_SATA_H */ diff --git a/arch/arm/include/asm/arch-omap5/spl.h b/arch/arm/include/asm/arch-omap5/spl.h index 2d5a62e..4a279cf 100644 --- a/arch/arm/include/asm/arch-omap5/spl.h +++ b/arch/arm/include/asm/arch-omap5/spl.h @@ -15,6 +15,7 @@ #define BOOT_DEVICE_MMC1 5 #define BOOT_DEVICE_MMC2 6 #define BOOT_DEVICE_MMC2_2 7 +#define BOOT_DEVICE_SATA 9 #define BOOT_DEVICE_SPI 10 #define BOOT_DEVICE_UART 0x43 diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 1b60b8f..38d656c 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -80,7 +80,7 @@ int board_init(void) int board_late_init(void) { - omap_sata_init(); + init_sata(0); return 0; } diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index af854da..abf7fe3 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -70,7 +70,7 @@ int board_init(void) int board_late_init(void) { - omap_sata_init(); + init_sata(0); return 0; }
Add the SATA boot support for OMAP5 and dra7xx. Renamed the omap_sata_init to the common init_sata(int dev) for commonality in with sata stack. Added the ROM boot device ID for SATA. Signed-off-by: Dan Murphy <dmurphy@ti.com> --- v2 - Removed omap_sata_init from header - http://patchwork.ozlabs.org/patch/314812/ arch/arm/cpu/armv7/omap-common/sata.c | 3 ++- arch/arm/include/asm/arch-omap5/sata.h | 9 --------- arch/arm/include/asm/arch-omap5/spl.h | 1 + board/ti/dra7xx/evm.c | 2 +- board/ti/omap5_uevm/evm.c | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-)