Skip to contentSkip to conversation

common: spl: Add spl sata boot support

PATCH New Dan Murphy 3 participants 10 messages Feb 3, 2014 – Feb 19, 2014 Arm (32-bit)

lore
Share & tools
lore

Dan Murphy

author
#0 lore raw

PATCH v2 1/2 common: spl: Add spl sata boot support

Add spl_sata to read a fat partition from a bootable SATA drive.

---

v2 - Removed debug print - http://patchwork.ozlabs.org/patch/314811/

 common/Makefile       |    3 +++
 common/cmd_scsi.c     |    2 ++
 common/spl/Makefile   |    1 +
 common/spl/spl.c      |    5 +++++
 common/spl/spl_sata.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/spl.h         |    3 +++
 spl/Makefile          |    1 +
 7 files changed, 64 insertions(+)
 create mode 100644 common/spl/spl_sata.c
common/Makefile +3 -0
index 4d99ecd..b0f5b62 100644
@@ -201,6 +201,9 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
 obj-$(CONFIG_USB_STORAGE) += usb_storage.o
 endif
+ifdef CONFIG_SPL_SATA_SUPPORT
+obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o
+endif
 ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
common/cmd_scsi.c +2 -0
index 7b97dc9..b3f7687 100644
@@ -168,7 +168,9 @@ removable:
 		scsi_curr_dev = -1;
 
 	printf("Found %d device(s).\n", scsi_max_devs);
+#ifndef CONFIG_SPL_BUILD
 	setenv_ulong("scsidevs", scsi_max_devs);
+#endif
 }
 
 int scsi_get_disk_count(void)
common/spl/Makefile +1 -0
index 65a1484f..64569c2 100644
@@ -18,4 +18,5 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
 obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
 obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
 obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
+obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
 endif
common/spl/spl.c +5 -0
index 0645cee..774fdad 100644
@@ -210,6 +210,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 		spl_usb_load_image();
 		break;
 #endif
+#ifdef CONFIG_SPL_SATA_SUPPORT
+	case BOOT_DEVICE_SATA:
+		spl_sata_load_image();
+		break;
+#endif
 	default:
 		debug("SPL: Un-supported Boot Device\n");
 		hang();
common/spl/spl_sata.c new file +49 -0

49 lines not on this page · raw message

include/spl.h +3 -0
index 5e24856..ee09fb6 100644
@@ -64,6 +64,9 @@ void spl_net_load_image(const char *device);
 /* USB SPL functions */
 void spl_usb_load_image(void);
 
+/* SATA SPL functions */
+void spl_sata_load_image(void);
+
 /* SPL FAT image functions */
 int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename);
 int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition);
spl/Makefile +1 -0
index 4143e38..28fcfdd 100644
@@ -85,6 +85,7 @@ LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/
 LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/
 LIBS-$(CONFIG_SPL_USB_HOST_SUPPORT) += drivers/usb/host/
 LIBS-$(CONFIG_OMAP_USB_PHY) += drivers/usb/phy/
+LIBS-$(CONFIG_SPL_SATA_SUPPORT) += drivers/block/
 
 ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 LIBS-y += arch/$(ARCH)/imx-common/
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 2/2 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.

---

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(-)
arch/arm/cpu/armv7/omap-common/sata.c +2 -1
index f5468c4..cad4fee 100644
@@ -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;
arch/arm/include/asm/arch-omap5/sata.h +0 -9
index 2ca8947..b69165b 100644
@@ -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 */
arch/arm/include/asm/arch-omap5/spl.h +1 -0
index 2d5a62e..4a279cf 100644
@@ -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
 
board/ti/dra7xx/evm.c +1 -1
index 1b60b8f..38d656c 100644
@@ -80,7 +80,7 @@ int board_init(void)
 
 int board_late_init(void)
 {
-	omap_sata_init();
+	init_sata(0);
 	return 0;
 }
 
board/ti/omap5_uevm/evm.c +1 -1
index af854da..abf7fe3 100644
@@ -70,7 +70,7 @@ int board_init(void)
 
 int board_late_init(void)
 {
-	omap_sata_init();
+	init_sata(0);
 	return 0;
 }
 
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH v2 2/2 ARM: O5/dra7xx: Add SATA boot support

Bump

Quoted 13 lines · Roger Quadros
Quoted 8 lines · Dan Murphy

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.

cheers,
-roger

Signature · 2 lines
------------------
Dan Murphy
#4 lore raw

PATCH v2 2/2 ARM: O5/dra7xx: Add SATA boot support

In reply to Dan Murphy
Quoted 9 lines · Dan Murphy

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.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140219/43fc4bb2/attachment.pgp>
#5 lore raw

PATCH v2 1/2 common: spl: Add spl sata boot support

In reply to Dan Murphy

Hi Dan,

Quoted 5 lines · Dan Murphy

Add spl_sata to read a fat partition from a bootable SATA drive.

---

I got some check-patch errors with this one.
Once that is fixed you can please add

cheers,
-roger

Quoted 149 lines

v2 - Removed debug print - http://patchwork.ozlabs.org/patch/314811/

 common/Makefile       |    3 +++
 common/cmd_scsi.c     |    2 ++
 common/spl/Makefile   |    1 +
 common/spl/spl.c      |    5 +++++
 common/spl/spl_sata.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/spl.h         |    3 +++
 spl/Makefile          |    1 +
 7 files changed, 64 insertions(+)
 create mode 100644 common/spl/spl_sata.c
common/Makefile +3 -0
index 4d99ecd..b0f5b62 100644
@@ -201,6 +201,9 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
 obj-$(CONFIG_USB_STORAGE) += usb_storage.o
 endif
+ifdef CONFIG_SPL_SATA_SUPPORT
+obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o
+endif
 ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
common/cmd_scsi.c +2 -0
index 7b97dc9..b3f7687 100644
@@ -168,7 +168,9 @@ removable:
 		scsi_curr_dev = -1;
 
 	printf("Found %d device(s).\n", scsi_max_devs);
+#ifndef CONFIG_SPL_BUILD
 	setenv_ulong("scsidevs", scsi_max_devs);
+#endif
 }
 
 int scsi_get_disk_count(void)
common/spl/Makefile +1 -0
index 65a1484f..64569c2 100644
@@ -18,4 +18,5 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
 obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
 obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
 obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
+obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
 endif
common/spl/spl.c +5 -0
index 0645cee..774fdad 100644
@@ -210,6 +210,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 		spl_usb_load_image();
 		break;
 #endif
+#ifdef CONFIG_SPL_SATA_SUPPORT
+	case BOOT_DEVICE_SATA:
+		spl_sata_load_image();
+		break;
+#endif
 	default:
 		debug("SPL: Un-supported Boot Device\n");
 		hang();
common/spl/spl_sata.c new file +49 -0
new file mode 100644
index 0000000..2e7adca
@@ -0,0 +1,49 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments, <www.ti.com>
+ *
+ * Dan Murphy <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * Derived work from spl_usb.c
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <asm/u-boot.h>
+#include <sata.h>
+#include <fat.h>
+#include <version.h>
+#include <image.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void spl_sata_load_image(void)
+{
+	int err;
+	block_dev_desc_t *stor_dev;
+
+	err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
+	if (err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+		printf("spl: sata init failed: err - %d\n", err);
+#endif
+		hang();
+	} else {
+		/* try to recognize storage devices immediately */
+		stor_dev = scsi_get_dev(0);
+	}
+
+#ifdef CONFIG_SPL_OS_BOOT
+	if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
+									CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
+#endif
+	err = spl_load_image_fat(stor_dev,
+				CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
+				CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+	if (err) {
+		puts("Error loading sata device\n");
+		hang();
+	}
+}
include/spl.h +3 -0
index 5e24856..ee09fb6 100644
@@ -64,6 +64,9 @@ void spl_net_load_image(const char *device);
 /* USB SPL functions */
 void spl_usb_load_image(void);
 
+/* SATA SPL functions */
+void spl_sata_load_image(void);
+
 /* SPL FAT image functions */
 int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename);
 int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition);
spl/Makefile +1 -0
index 4143e38..28fcfdd 100644
@@ -85,6 +85,7 @@ LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/
 LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/
 LIBS-$(CONFIG_SPL_USB_HOST_SUPPORT) += drivers/usb/host/
 LIBS-$(CONFIG_OMAP_USB_PHY) += drivers/usb/phy/
+LIBS-$(CONFIG_SPL_SATA_SUPPORT) += drivers/block/
 
 ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 LIBS-y += arch/$(ARCH)/imx-common/
author
#6 lore raw

PATCH v2 1/2 common: spl: Add spl sata boot support

Roger

Quoted 10 lines · Roger Quadros

Hi Dan,

Quoted 5 lines · Dan Murphy

Add spl_sata to read a fat partition from a bootable SATA drive.

---

I got some check-patch errors with this one.
Once that is fixed you can please add

Thanks for the review

Checkpatch errors or warnings?

When I ran checkpatch before submitting I did have 2 warnings but these should be acceptable.

I will let the maintainer decide on the acceptability of the two warnings since these warnings are consistent with the spl_mmc and spl_usb files

WARNING: suspect code indent for conditional statements (8, 8) #122: FILE: common/spl/spl_sata.c:39:
+ if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
[...]
+ err = spl_load_image_fat(stor_dev,

WARNING: line over 80 characters
#123: FILE: common/spl/spl_sata.c:40:
+ CONFIG_SYS_SATA_FAT_BOOT_PARTITION))

total: 0 errors, 2 warnings, 99 lines checked

Quoted 153 lines

cheers,
-roger

Quoted 148 lines

v2 - Removed debug print - http://patchwork.ozlabs.org/patch/314811/

 common/Makefile       |    3 +++
 common/cmd_scsi.c     |    2 ++
 common/spl/Makefile   |    1 +
 common/spl/spl.c      |    5 +++++
 common/spl/spl_sata.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/spl.h         |    3 +++
 spl/Makefile          |    1 +
 7 files changed, 64 insertions(+)
 create mode 100644 common/spl/spl_sata.c
common/Makefile +3 -0
index 4d99ecd..b0f5b62 100644
@@ -201,6 +201,9 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
 obj-$(CONFIG_USB_STORAGE) += usb_storage.o
 endif
+ifdef CONFIG_SPL_SATA_SUPPORT
+obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o
+endif
 ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
common/cmd_scsi.c +2 -0
index 7b97dc9..b3f7687 100644
@@ -168,7 +168,9 @@ removable:
 		scsi_curr_dev = -1;
 
 	printf("Found %d device(s).\n", scsi_max_devs);
+#ifndef CONFIG_SPL_BUILD
 	setenv_ulong("scsidevs", scsi_max_devs);
+#endif
 }
 
 int scsi_get_disk_count(void)
common/spl/Makefile +1 -0
index 65a1484f..64569c2 100644
@@ -18,4 +18,5 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
 obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
 obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
 obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
+obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
 endif
common/spl/spl.c +5 -0
index 0645cee..774fdad 100644
@@ -210,6 +210,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 		spl_usb_load_image();
 		break;
 #endif
+#ifdef CONFIG_SPL_SATA_SUPPORT
+	case BOOT_DEVICE_SATA:
+		spl_sata_load_image();
+		break;
+#endif
 	default:
 		debug("SPL: Un-supported Boot Device\n");
 		hang();
common/spl/spl_sata.c new file +49 -0
new file mode 100644
index 0000000..2e7adca
@@ -0,0 +1,49 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments, <www.ti.com>
+ *
+ * Dan Murphy <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * Derived work from spl_usb.c
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <asm/u-boot.h>
+#include <sata.h>
+#include <fat.h>
+#include <version.h>
+#include <image.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void spl_sata_load_image(void)
+{
+	int err;
+	block_dev_desc_t *stor_dev;
+
+	err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
+	if (err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+		printf("spl: sata init failed: err - %d\n", err);
+#endif
+		hang();
+	} else {
+		/* try to recognize storage devices immediately */
+		stor_dev = scsi_get_dev(0);
+	}
+
+#ifdef CONFIG_SPL_OS_BOOT
+	if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
+									CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
+#endif
+	err = spl_load_image_fat(stor_dev,
+				CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
+				CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+	if (err) {
+		puts("Error loading sata device\n");
+		hang();
+	}
+}
include/spl.h +3 -0
index 5e24856..ee09fb6 100644
@@ -64,6 +64,9 @@ void spl_net_load_image(const char *device);
 /* USB SPL functions */
 void spl_usb_load_image(void);
 
+/* SATA SPL functions */
+void spl_sata_load_image(void);
+
 /* SPL FAT image functions */
 int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename);
 int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition);
spl/Makefile +1 -0
index 4143e38..28fcfdd 100644
@@ -85,6 +85,7 @@ LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/
 LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/
 LIBS-$(CONFIG_SPL_USB_HOST_SUPPORT) += drivers/usb/host/
 LIBS-$(CONFIG_OMAP_USB_PHY) += drivers/usb/phy/
+LIBS-$(CONFIG_SPL_SATA_SUPPORT) += drivers/block/
 
 ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 LIBS-y += arch/$(ARCH)/imx-common/
Signature · 2 lines
------------------
Dan Murphy
#7 lore raw

PATCH v2 1/2 common: spl: Add spl sata boot support

Dan,

Quoted 9 lines · Dan Murphy

Roger

Quoted 6 lines · Roger Quadros

Hi Dan,

Quoted 3 lines · Dan Murphy

Add spl_sata to read a fat partition from a bootable SATA drive.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

---

I got some check-patch errors with this one.
Once that is fixed you can please add

Thanks for the review

Checkpatch errors or warnings?

Right, warnings not errors.

cheers,
-roger

Quoted 175 lines

When I ran checkpatch before submitting I did have 2 warnings but these should be acceptable.

I will let the maintainer decide on the acceptability of the two warnings since these warnings are consistent with the spl_mmc and spl_usb files

WARNING: suspect code indent for conditional statements (8, 8) #122: FILE: common/spl/spl_sata.c:39:

common/spl/spl_sata.c new file +2 -0
+    if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
[...]
+    err = spl_load_image_fat(stor_dev,

WARNING: line over 80 characters
#123: FILE: common/spl/spl_sata.c:40:
+ CONFIG_SYS_SATA_FAT_BOOT_PARTITION))

total: 0 errors, 2 warnings, 99 lines checked

Quoted 153 lines

cheers,
-roger

Quoted 148 lines

v2 - Removed debug print - http://patchwork.ozlabs.org/patch/314811/

 common/Makefile       |    3 +++
 common/cmd_scsi.c     |    2 ++
 common/spl/Makefile   |    1 +
 common/spl/spl.c      |    5 +++++
 common/spl/spl_sata.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/spl.h         |    3 +++
 spl/Makefile          |    1 +
 7 files changed, 64 insertions(+)
 create mode 100644 common/spl/spl_sata.c
common/Makefile +3 -0
index 4d99ecd..b0f5b62 100644
@@ -201,6 +201,9 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
 obj-$(CONFIG_USB_STORAGE) += usb_storage.o
 endif
+ifdef CONFIG_SPL_SATA_SUPPORT
+obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o
+endif
 ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
common/cmd_scsi.c +2 -0
index 7b97dc9..b3f7687 100644
@@ -168,7 +168,9 @@ removable:
 		scsi_curr_dev = -1;
 
 	printf("Found %d device(s).\n", scsi_max_devs);
+#ifndef CONFIG_SPL_BUILD
 	setenv_ulong("scsidevs", scsi_max_devs);
+#endif
 }
 
 int scsi_get_disk_count(void)
common/spl/Makefile +1 -0
index 65a1484f..64569c2 100644
@@ -18,4 +18,5 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
 obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
 obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
 obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
+obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
 endif
common/spl/spl.c +5 -0
index 0645cee..774fdad 100644
@@ -210,6 +210,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 		spl_usb_load_image();
 		break;
 #endif
+#ifdef CONFIG_SPL_SATA_SUPPORT
+	case BOOT_DEVICE_SATA:
+		spl_sata_load_image();
+		break;
+#endif
 	default:
 		debug("SPL: Un-supported Boot Device\n");
 		hang();
common/spl/spl_sata.c new file +49 -0
new file mode 100644
index 0000000..2e7adca
@@ -0,0 +1,49 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments, <www.ti.com>
+ *
+ * Dan Murphy <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * Derived work from spl_usb.c
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <asm/u-boot.h>
+#include <sata.h>
+#include <fat.h>
+#include <version.h>
+#include <image.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void spl_sata_load_image(void)
+{
+	int err;
+	block_dev_desc_t *stor_dev;
+
+	err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
+	if (err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+		printf("spl: sata init failed: err - %d\n", err);
+#endif
+		hang();
+	} else {
+		/* try to recognize storage devices immediately */
+		stor_dev = scsi_get_dev(0);
+	}
+
+#ifdef CONFIG_SPL_OS_BOOT
+	if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
+									CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
+#endif
+	err = spl_load_image_fat(stor_dev,
+				CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
+				CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+	if (err) {
+		puts("Error loading sata device\n");
+		hang();
+	}
+}
include/spl.h +3 -0
index 5e24856..ee09fb6 100644
@@ -64,6 +64,9 @@ void spl_net_load_image(const char *device);
 /* USB SPL functions */
 void spl_usb_load_image(void);
 
+/* SATA SPL functions */
+void spl_sata_load_image(void);
+
 /* SPL FAT image functions */
 int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename);
 int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition);
spl/Makefile +1 -0
index 4143e38..28fcfdd 100644
@@ -85,6 +85,7 @@ LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/
 LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/
 LIBS-$(CONFIG_SPL_USB_HOST_SUPPORT) += drivers/usb/host/
 LIBS-$(CONFIG_OMAP_USB_PHY) += drivers/usb/phy/
+LIBS-$(CONFIG_SPL_SATA_SUPPORT) += drivers/block/
 
 ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 LIBS-y += arch/$(ARCH)/imx-common/
author
#8 lore raw

PATCH v2 1/2 common: spl: Add spl sata boot support

Bump

Quoted 196 lines · Roger Quadros

Dan,

Quoted 9 lines · Dan Murphy

Roger

Quoted 6 lines · Roger Quadros

Hi Dan,

Quoted 3 lines · Dan Murphy

Add spl_sata to read a fat partition from a bootable SATA drive.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

---

I got some check-patch errors with this one.
Once that is fixed you can please add

Thanks for the review

Checkpatch errors or warnings?

Right, warnings not errors.

cheers,
-roger

Quoted 172 lines

When I ran checkpatch before submitting I did have 2 warnings but these should be acceptable.

I will let the maintainer decide on the acceptability of the two warnings since these warnings are consistent with the spl_mmc and spl_usb files

WARNING: suspect code indent for conditional statements (8, 8) #122: FILE: common/spl/spl_sata.c:39:

common/spl/spl_sata.c new file +2 -0
+    if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
[...]
+    err = spl_load_image_fat(stor_dev,

WARNING: line over 80 characters
#123: FILE: common/spl/spl_sata.c:40:
+ CONFIG_SYS_SATA_FAT_BOOT_PARTITION))

total: 0 errors, 2 warnings, 99 lines checked

Quoted 152 lines

cheers,
-roger

Quoted 148 lines

v2 - Removed debug print - http://patchwork.ozlabs.org/patch/314811/

 common/Makefile       |    3 +++
 common/cmd_scsi.c     |    2 ++
 common/spl/Makefile   |    1 +
 common/spl/spl.c      |    5 +++++
 common/spl/spl_sata.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/spl.h         |    3 +++
 spl/Makefile          |    1 +
 7 files changed, 64 insertions(+)
 create mode 100644 common/spl/spl_sata.c
common/Makefile +3 -0
index 4d99ecd..b0f5b62 100644
@@ -201,6 +201,9 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
 obj-$(CONFIG_USB_STORAGE) += usb_storage.o
 endif
+ifdef CONFIG_SPL_SATA_SUPPORT
+obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o
+endif
 ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
common/cmd_scsi.c +2 -0
index 7b97dc9..b3f7687 100644
@@ -168,7 +168,9 @@ removable:
 		scsi_curr_dev = -1;
 
 	printf("Found %d device(s).\n", scsi_max_devs);
+#ifndef CONFIG_SPL_BUILD
 	setenv_ulong("scsidevs", scsi_max_devs);
+#endif
 }
 
 int scsi_get_disk_count(void)
common/spl/Makefile +1 -0
index 65a1484f..64569c2 100644
@@ -18,4 +18,5 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
 obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
 obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
 obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
+obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
 endif
common/spl/spl.c +5 -0
index 0645cee..774fdad 100644
@@ -210,6 +210,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 		spl_usb_load_image();
 		break;
 #endif
+#ifdef CONFIG_SPL_SATA_SUPPORT
+	case BOOT_DEVICE_SATA:
+		spl_sata_load_image();
+		break;
+#endif
 	default:
 		debug("SPL: Un-supported Boot Device\n");
 		hang();
common/spl/spl_sata.c new file +49 -0
new file mode 100644
index 0000000..2e7adca
@@ -0,0 +1,49 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments, <www.ti.com>
+ *
+ * Dan Murphy <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * Derived work from spl_usb.c
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <asm/u-boot.h>
+#include <sata.h>
+#include <fat.h>
+#include <version.h>
+#include <image.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void spl_sata_load_image(void)
+{
+	int err;
+	block_dev_desc_t *stor_dev;
+
+	err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
+	if (err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+		printf("spl: sata init failed: err - %d\n", err);
+#endif
+		hang();
+	} else {
+		/* try to recognize storage devices immediately */
+		stor_dev = scsi_get_dev(0);
+	}
+
+#ifdef CONFIG_SPL_OS_BOOT
+	if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
+									CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
+#endif
+	err = spl_load_image_fat(stor_dev,
+				CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
+				CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+	if (err) {
+		puts("Error loading sata device\n");
+		hang();
+	}
+}
include/spl.h +3 -0
index 5e24856..ee09fb6 100644
@@ -64,6 +64,9 @@ void spl_net_load_image(const char *device);
 /* USB SPL functions */
 void spl_usb_load_image(void);
 
+/* SATA SPL functions */
+void spl_sata_load_image(void);
+
 /* SPL FAT image functions */
 int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename);
 int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition);
spl/Makefile +1 -0
index 4143e38..28fcfdd 100644
@@ -85,6 +85,7 @@ LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/
 LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/
 LIBS-$(CONFIG_SPL_USB_HOST_SUPPORT) += drivers/usb/host/
 LIBS-$(CONFIG_OMAP_USB_PHY) += drivers/usb/phy/
+LIBS-$(CONFIG_SPL_SATA_SUPPORT) += drivers/block/
 
 ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 LIBS-y += arch/$(ARCH)/imx-common/
Signature · 2 lines
------------------
Dan Murphy
#9 lore raw

PATCH v2 1/2 common: spl: Add spl sata boot support

In reply to Dan Murphy
Quoted 5 lines · Dan Murphy

Add spl_sata to read a fat partition from a bootable SATA drive.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140219/599a6ace/attachment.pgp>