From 42a8d227b508395ec370825aa100131917f2ceda Mon Sep 17 00:00:00 2001 From: "Ye.Li" Date: Thu, 12 Jun 2014 17:28:12 +0800 Subject: ENGR00315894-72 iMX6SX:SABRESD/19x19ARM2 Add splash screen support in BSP Enable the video drivers and MXS LCDIF driver to support the splash screen on MX6SX SDB and 19x19 ARM2. Add BSP codes for video parameters and LCDIF/LVDS initialization. "panel" env is used for selecting the display panel. Set "panel" env to "Hannstar-XGA" for LVDS display. Set "panel" env to "MCIMX28LCD" for parallel LCD display. Signed-off-by: Ye.Li --- include/configs/mx6sx_19x19_arm2.h | 2 ++ include/configs/mx6sx_arm2.h | 25 ++++++++++++++++++++++++- include/configs/mx6sxsabresd.h | 28 +++++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/mx6sx_19x19_arm2.h b/include/configs/mx6sx_19x19_arm2.h index 09221ea..1733903 100644 --- a/include/configs/mx6sx_19x19_arm2.h +++ b/include/configs/mx6sx_19x19_arm2.h @@ -9,6 +9,8 @@ #ifndef __MX6SX_19X19_ARM2_CONFIG_H #define __MX6SX_19X19_ARM2_CONFIG_H +#define CONFIG_VIDEO + #include "mx6sx_arm2.h" #define CONFIG_SYS_FSL_USDHC_NUM 1 diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h index b0478b6..1fd1d5f 100644 --- a/include/configs/mx6sx_arm2.h +++ b/include/configs/mx6sx_arm2.h @@ -33,7 +33,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT @@ -161,6 +161,13 @@ #define CONFIG_MMC_DEV_SET " " #endif +#ifdef CONFIG_VIDEO +#define CONFIG_VIDEO_MODE \ + "panel=Hannstar-XGA\0" +#else +#define CONFIG_VIDEO_MODE "" +#endif + #define CONFIG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ @@ -176,6 +183,7 @@ #if defined(CONFIG_SYS_BOOT_NAND) #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ + CONFIG_VIDEO_MODE \ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffff\0" \ "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \ @@ -189,6 +197,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ UPDATE_M4_ENV \ + CONFIG_VIDEO_MODE \ "script=boot.scr\0" \ "uimage=uImage\0" \ "console=ttymxc0\0" \ @@ -404,6 +413,20 @@ #define CONFIG_CMD_CACHE #endif +#ifdef CONFIG_VIDEO +#define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_MXS +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_SW_CURSOR +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_VIDEO_BMP_LOGO +#endif /* USB Configs */ #define CONFIG_CMD_USB diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index c60445b..1e9e2cc 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -33,7 +33,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT @@ -114,6 +114,9 @@ #define CONFIG_PMIC_I2C_SLAVE 0x8 #endif +/* VIDEO */ +#define CONFIG_VIDEO + /* Command definition */ #include @@ -149,6 +152,13 @@ #define UPDATE_M4_ENV "" #endif +#ifdef CONFIG_VIDEO +#define CONFIG_VIDEO_MODE \ + "panel=Hannstar-XGA\0" +#else +#define CONFIG_VIDEO_MODE "" +#endif + #define CONFIG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ @@ -163,6 +173,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ UPDATE_M4_ENV \ + CONFIG_VIDEO_MODE \ "script=boot.scr\0" \ "uimage=uImage\0" \ "console=ttymxc0\0" \ @@ -323,6 +334,21 @@ #define CONFIG_CMD_CACHE #endif +#ifdef CONFIG_VIDEO +#define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_MXS +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_SW_CURSOR +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_VIDEO_BMP_LOGO +#endif + #define CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -- cgit v1.1