summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-omap5
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2014-02-03 06:59:02 -0600
committerTom Rini <trini@ti.com>2014-02-19 10:47:45 -0500
commite9024ef27d0fc011ac36100c61dbd92025c96108 (patch)
treedd12ce62d45ea3050929d796f7bd117074da013d /arch/arm/include/asm/arch-omap5
parentfff40a7e02092eee11970e7001c8560df419cac1 (diff)
downloadtalos-obmc-uboot-e9024ef27d0fc011ac36100c61dbd92025c96108.tar.gz
talos-obmc-uboot-e9024ef27d0fc011ac36100c61dbd92025c96108.zip
ARM: O5/dra7xx: Add SATA boot support
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> Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/include/asm/arch-omap5')
-rw-r--r--arch/arm/include/asm/arch-omap5/sata.h9
-rw-r--r--arch/arm/include/asm/arch-omap5/spl.h1
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/include/asm/arch-omap5/sata.h b/arch/arm/include/asm/arch-omap5/sata.h
index 2ca8947730..b69165b5ee 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 2d5a62e660..4a279cf052 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
OpenPOWER on IntegriCloud