Patchwork [U-Boot] imx: nitrogen6x: Add splash screen support to nitrogen6x

login
register
mail settings
Submitter Robert Winkler
Date June 14, 2013, 10:54 p.m.
Message ID <1371250449-16329-1-git-send-email-robert.winkler@boundarydevices.com>
Download mbox | patch
Permalink /patch/251558/
State Not Applicable
Delegated to: Stefano Babic
Headers show

Comments

Robert Winkler - June 14, 2013, 10:54 p.m.
Depends on:
18d1c87ebe2a6a05905ae1cdd7a31abe6b5ee39d
b38050121cd3fea821a048661cdad5bf71f3a2b8

Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
---
 board/boundary/nitrogen6x/nitrogen6x.c | 21 +++++++++++++++++++++
 include/configs/nitrogen6x.h           | 10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

Patch

diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 8f0f9b8..7096029 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -388,6 +388,27 @@  int board_eth_init(bd_t *bis)
 	return 0;
 }
 
+int splash_screen_prepare(void)
+{
+	char *env_loadsplash;
+
+	if (!getenv("splashimage") || !getenv("splashsize"))
+		return 1;
+
+	env_loadsplash = getenv("loadsplash");
+	if (!env_loadsplash) {
+		printf("Environment variable loadsplash not found!\n");
+		return 1;
+	}
+
+	if (run_command_list(env_loadsplash, -1, 0)) {
+		printf("Failed to run loadsplash %s\n\n", env_loadsplash);
+		return 1;
+	}
+	printf("leaving splash_screen_prepare\n");
+	return 0;
+}
+
 static void setup_buttons(void)
 {
 	imx_iomux_v3_setup_multiple_pads(button_pads,
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index aea91bc..3cd850d 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -38,7 +38,7 @@ 
 #define CONFIG_REVISION_TAG
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(10 * 1024 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(15 * 1024 * 1024)
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
@@ -149,6 +149,13 @@ 
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN_ALIGN
+
+#define CONFIG_VIDEO_BMP_GZIP
+#ifdef CONFIG_VIDEO_BMP_GZIP
+#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)
+#endif
+
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IPUV3_CLK 260000000
@@ -208,6 +215,8 @@ 
 		"echo ; echo serial console at 115200, 8N1 ; echo ; " \
 		"echo details at http://boundarydevices.com/6q_bootscript ; " \
 		"setenv stdout serial\0" \
+	"loadsplash=if sf probe ; then " \
+		"sf read ${splashimage} c2000 ${splashsize} ; fi\0" \
 	"upgradeu=for dtype in " CONFIG_DRIVE_TYPES \
 		"; do " \
 		"for disk in 0 1 ; do ${dtype} dev ${disk} ;" \