summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2015-01-14 10:42:53 +0200
committerStefano Babic <sbabic@denx.de>2015-01-29 17:42:30 +0100
commit3a236a356397449bf3ad1e72221053b5a3d87b80 (patch)
tree319b1e6d39690eb4cd145e5f6e238644b24ba8ba
parent7e8d7f2ac2035efa04382bbeede1b4fbe1c66987 (diff)
downloadu-boot-imx-3a236a356397449bf3ad1e72221053b5a3d87b80.zip
u-boot-imx-3a236a356397449bf3ad1e72221053b5a3d87b80.tar.gz
u-boot-imx-3a236a356397449bf3ad1e72221053b5a3d87b80.tar.bz2
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>
-rw-r--r--board/compulab/cm_fx6/cm_fx6.c17
-rw-r--r--include/configs/cm_fx6.h4
2 files changed, 21 insertions, 0 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b31e1f5..b5c3ea1 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 49b1b00..b92ba97 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