From: Nikita Kiryanov <nikita@compulab.co.il>
Date: Thu, 29 Oct 2015 09:54:43 +0000 (+0200)
Subject: splash_source: add support for filesystem formatted sata
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=50c2d2e120f10042d2241353b4e0d564fc5c3260

splash_source: add support for filesystem formatted sata

Add support for loading splashimage from filesystem formatted sata
storage.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---

diff --git a/common/splash_source.c b/common/splash_source.c
index cf475699f0..a09dd4b46e 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -13,6 +13,7 @@
 #include <spi_flash.h>
 #include <spi.h>
 #include <usb.h>
+#include <sata.h>
 #include <bmp_layout.h>
 #include <fs.h>
 
@@ -116,6 +117,9 @@ static int splash_select_fs_dev(struct splash_location *location)
 	case SPLASH_STORAGE_USB:
 		res = fs_set_blk_dev("usb", location->devpart, FS_TYPE_ANY);
 		break;
+	case SPLASH_STORAGE_SATA:
+		res = fs_set_blk_dev("sata", location->devpart, FS_TYPE_ANY);
+		break;
 	default:
 		printf("Error: unsupported location storage.\n");
 		return -ENODEV;
@@ -146,6 +150,19 @@ static inline int splash_init_usb(void)
 }
 #endif
 
+#ifdef CONFIG_CMD_SATA
+static int splash_init_sata(void)
+{
+	return sata_initialize();
+}
+#else
+static inline int splash_init_sata(void)
+{
+	printf("Cannot load splash image: no SATA support\n");
+	return -ENOSYS;
+}
+#endif
+
 #define SPLASH_SOURCE_DEFAULT_FILE_NAME		"splash.bmp"
 
 static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
@@ -161,6 +178,9 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
 	if (location->storage == SPLASH_STORAGE_USB)
 		res = splash_init_usb();
 
+	if (location->storage == SPLASH_STORAGE_SATA)
+		res = splash_init_sata();
+
 	if (res)
 		return res;
 
diff --git a/include/splash.h b/include/splash.h
index b728bd62a7..f0755ca695 100644
--- a/include/splash.h
+++ b/include/splash.h
@@ -29,6 +29,7 @@ enum splash_storage {
 	SPLASH_STORAGE_SF,
 	SPLASH_STORAGE_MMC,
 	SPLASH_STORAGE_USB,
+	SPLASH_STORAGE_SATA,
 };
 
 enum splash_flags {