From: Nikita Kiryanov <nikita@compulab.co.il>
Date: Wed, 14 Jan 2015 08:42:53 +0000 (+0200)
Subject: arm: mx6: cm-fx6: add splash screen support
X-Git-Tag: v2015.04-rc2~35^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3a236a356397449bf3ad1e72221053b5a3d87b80;p=oweals%2Fu-boot.git

arm: mx6: cm-fx6: add splash screen support

Add support for splash screen.
The splash screen is loaded from the SPI flash and is displayed on the
HDMI display.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
[grinberg@compulab.co.il: minor code and commit message updates]
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
---

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b31e1f59b6..b5c3ea19d3 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -27,9 +27,26 @@
 #include <dm/platform_data/serial_mxc.h>
 #include "common.h"
 #include "../common/eeprom.h"
+#include "../common/common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_SPLASH_SCREEN
+static struct splash_location cm_fx6_splash_locations[] = {
+	{
+		.name = "sf",
+		.storage = SPLASH_STORAGE_SF,
+		.offset = 0x100000,
+	},
+};
+
+int splash_screen_prepare(void)
+{
+	return cl_splash_screen_prepare(cm_fx6_splash_locations,
+					ARRAY_SIZE(cm_fx6_splash_locations));
+}
+#endif
+
 #ifdef CONFIG_IMX_HDMI
 static void cm_fx6_enable_hdmi(struct display_info_t const *dev)
 {
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 49b1b0023e..b92ba976e9 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -312,6 +312,10 @@
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_VIDEO_SW_CURSOR
 
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_CMD_BMP
+#define CONFIG_VIDEO_BMP_RLE8
+
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO