Skip to contentSkip to conversation

splash: Introduce default_splash_locations

PATCH New Alexey Brodkin 2 participants 5 messages Jul 1, 2016 – Jul 27, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 splash: Introduce default_splash_locations

This change introduces default_splash_locations which simplifies splash recovery from the first partition of USB/MMC/SATA drive.

Given usual mapping of the first partition of external media for basic boot stuff like uImage/zImaage, .dtb etc it looks quite obvious option to put there splash.bmp as well.

Cc Nikita Kiryanov <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jeroen Hofstee <[email protected]>
Cc Anatolij Gustschin <[email protected]>
Cc Robert Winkler <[email protected]>
---
 common/splash.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)
common/splash.c +29 -1
index 561d35b..89af437 100644
@@ -24,9 +24,37 @@
 #include <splash.h>
 #include <lcd.h>
 
+static struct splash_location default_splash_locations[] = {
+	{
+		.name = "sf",
+		.storage = SPLASH_STORAGE_SF,
+		.flags = SPLASH_STORAGE_RAW,
+		.offset = 0x0,
+	},
+	{
+		.name = "mmc_fs",
+		.storage = SPLASH_STORAGE_MMC,
+		.flags = SPLASH_STORAGE_FS,
+		.devpart = "0:1",
+	},
+	{
+		.name = "usb_fs",
+		.storage = SPLASH_STORAGE_USB,
+		.flags = SPLASH_STORAGE_FS,
+		.devpart = "0:1",
+	},
+	{
+		.name = "sata_fs",
+		.storage = SPLASH_STORAGE_SATA,
+		.flags = SPLASH_STORAGE_FS,
+		.devpart = "0:1",
+	},
+};
+
 __weak int splash_screen_prepare(void)
 {
-	return 0;
+	return splash_source_load(default_splash_locations,
+				  ARRAY_SIZE(default_splash_locations));
 }
 
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN
Signature · 1 line
2.5.5
#1 lore raw

PATCH 1/1 splash: Introduce default_splash_locations

Quoted 14 lines · On Fri, 1 Jul 2016 22:48:16 +0300 Alexey Brodkin Alexey.Brodkin at…

This change introduces default_splash_locations which simplifies splash recovery from the first partition of USB/MMC/SATA drive.

Given usual mapping of the first partition of external media for basic boot stuff like uImage/zImaage, .dtb etc it looks quite obvious option to put there splash.bmp as well.

Cc Nikita Kiryanov <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jeroen Hofstee <[email protected]>
Cc Anatolij Gustschin <[email protected]>
Cc Robert Winkler <[email protected]>
Quoted 3 lines
---
 common/splash.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

applied to u-boot-video/master, thanks!

Anatolij

#2 lore raw

PATCH 1/1 splash: Introduce default_splash_locations

Quoted 1 line · On Mon, 25 Jul 2016 23:04:34 +0200 Anatolij Gustschin agust at denx.de wrote:

applied to u-boot-video/master,

removed as it breaks building sandbox. Patch v2 is out now.

--
Anatolij

#3 lore raw

PATCH v2 1/1 splash: Introduce default_splash_locations

In reply to Alexey Brodkin

From: Alexey Brodkin <[email protected]>

This change introduces default_splash_locations which simplifies splash recovery from the first partition of USB/MMC/SATA drive.

Given usual mapping of the first partition of external media for basic boot stuff like uImage/zImage, .dtb etc it looks quite obvious option to put there splash.bmp as well.

Cc Nikita Kiryanov <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jeroen Hofstee <[email protected]>

---

Changes in v2:
- add empty splash_source_load() if CONFIG_SPLASH_SOURCE is not defined (fixes building sandbox configuration)

 common/splash.c  |   30 +++++++++++++++++++++++++++++-
 include/splash.h |    9 +++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
common/splash.c +29 -1
index 561d35b..89af437 100644
@@ -24,9 +24,37 @@
 #include <splash.h>
 #include <lcd.h>
 
+static struct splash_location default_splash_locations[] = {
+	{
+		.name = "sf",
+		.storage = SPLASH_STORAGE_SF,
+		.flags = SPLASH_STORAGE_RAW,
+		.offset = 0x0,
+	},
+	{
+		.name = "mmc_fs",
+		.storage = SPLASH_STORAGE_MMC,
+		.flags = SPLASH_STORAGE_FS,
+		.devpart = "0:1",
+	},
+	{
+		.name = "usb_fs",
+		.storage = SPLASH_STORAGE_USB,
+		.flags = SPLASH_STORAGE_FS,
+		.devpart = "0:1",
+	},
+	{
+		.name = "sata_fs",
+		.storage = SPLASH_STORAGE_SATA,
+		.flags = SPLASH_STORAGE_FS,
+		.devpart = "0:1",
+	},
+};
+
 __weak int splash_screen_prepare(void)
 {
-	return 0;
+	return splash_source_load(default_splash_locations,
+				  ARRAY_SIZE(default_splash_locations));
 }
 
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN
include/splash.h +9 -0
index 25df1cf..136eac7 100644
@@ -47,7 +47,16 @@ struct splash_location {
 	char *ubivol;	/* UBI volume-name for ubifsmount */
 };
 
+#ifdef CONFIG_SPLASH_SOURCE
 int splash_source_load(struct splash_location *locations, uint size);
+#else
+static inline int splash_source_load(struct splash_location *locations,
+				     uint size)
+{
+	return 0;
+}
+#endif
+
 int splash_screen_prepare(void);
 
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH v2 1/1 splash: Introduce default_splash_locations

Quoted 17 lines · On Tue, 26 Jul 2016 08:52:52 +0200 Anatolij Gustschin agust at denx.de wrote:

From: Alexey Brodkin <[email protected]>

This change introduces default_splash_locations which simplifies splash recovery from the first partition of USB/MMC/SATA drive.

Given usual mapping of the first partition of external media for basic boot stuff like uImage/zImage, .dtb etc it looks quite obvious option to put there splash.bmp as well.

Cc Nikita Kiryanov <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jeroen Hofstee <[email protected]>

---

Quoted 7 lines

Changes in v2:
- add empty splash_source_load() if CONFIG_SPLASH_SOURCE is not defined (fixes building sandbox configuration)

 common/splash.c  |   30 +++++++++++++++++++++++++++++-
 include/splash.h |    9 +++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

applied to u-boot-video/master.

--
Anatolij