Commit b6fa9791 authored by Ye Li's avatar Ye Li

MLK-14628 epdc: Fix configs issue

In Kconfig, the CONFIG_MXC_EPDC depends on CONFIG_LCD.
We can't only set the CONFIG_MXC_EPDC in defconfig and set CONFIG_LCD in header file.
This will cause the both two configs are not selected. So in fact the epdc codes
are not compiled.
Signed-off-by: default avatarYe Li <ye.li@nxp.com>
parent d459c153
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_MX6SLEVK=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SPLASH_SCREEN"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
......@@ -45,3 +45,5 @@ CONFIG_DM_REGULATOR_FIXED=y
CONFIG_DM_REGULATOR_GPIO=y
CONFIG_DM_ETH=y
CONFIG_DM_USB=y
CONFIG_LCD=y
CONFIG_MXC_EPDC=y
......@@ -3,6 +3,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_MX6ULL_DDR3_ARM2=y
CONFIG_VIDEO=y
CONFIG_LCD=y
CONFIG_MXC_EPDC=y
CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-ddr3-arm2-epdc"
CONFIG_DEFAULT_FDT_FILE="imx6ull-14x14-ddr3-arm2.dtb"
......
......@@ -8,6 +8,7 @@ CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="imx7d-12x12-lpddr3-arm2"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg"
CONFIG_DEFAULT_FDT_FILE="imx7d-12x12-lpddr3-arm2.dtb"
CONFIG_LCD=y
CONFIG_MXC_EPDC=y
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
......
......@@ -8,6 +8,7 @@ CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb-epdc"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
CONFIG_MXC_EPDC=y
CONFIG_LCD=y
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
......
......@@ -221,20 +221,16 @@
/*
* SPLASH SCREEN Configs
*/
#ifdef CONFIG_SPLASH_SCREEN
#ifdef CONFIG_MXC_EPDC
/*
* Framebuffer and LCD
*/
#define CONFIG_CMD_BMP
#define CONFIG_MXC_EPDC 1
#define CONFIG_LCD
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#ifdef CONFIG_MXC_EPDC
#define CONFIG_SPLASH_SCREEN
#undef LCD_TEST_PATTERN
#define LCD_BPP LCD_MONOCHROME
#define CONFIG_WAVEFORM_BUF_SIZE 0x200000
#endif
#endif /* CONFIG_SPLASH_SCREEN */
#if defined(CONFIG_FASTBOOT)
......
......@@ -81,14 +81,12 @@
/*
* SPLASH SCREEN Configs
*/
#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_MXC_EPDC)
#if defined(CONFIG_MXC_EPDC)
/*
* Framebuffer and LCD
*/
#define CONFIG_CFB_CONSOLE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_CMD_BMP
#define CONFIG_LCD
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#undef LCD_TEST_PATTERN
/* #define CONFIG_SPLASH_IS_IN_MMC 1 */
......
......@@ -322,12 +322,12 @@
#define CONFIG_IMX_VIDEO_SKIP
#endif
#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_MXC_EPDC)
#if defined(CONFIG_MXC_EPDC)
/*
* Framebuffer and LCD
*/
#define CONFIG_CMD_BMP
#define CONFIG_LCD
#define CONFIG_SPLASH_SCREEN
#undef LCD_TEST_PATTERN
/* #define CONFIG_SPLASH_IS_IN_MMC 1 */
......
......@@ -317,12 +317,12 @@
/*
* SPLASH SCREEN Configs
*/
#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_MXC_EPDC)
#if defined(CONFIG_MXC_EPDC)
/*
* Framebuffer and LCD
*/
#define CONFIG_CMD_BMP
#define CONFIG_LCD
#define CONFIG_SPLASH_SCREEN
#undef LCD_TEST_PATTERN
/* #define CONFIG_SPLASH_IS_IN_MMC 1 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment