diff options
| author | Ye Li <ye.li@nxp.com> | 2017-04-06 10:30:54 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-06 10:30:54 +0800 |
| commit | b6fa97917c085fbbd22b16765afa6f68bdc4234d (patch) | |
| tree | c26008dd9eff61ae269332481de18ec3ae2b8200 /include | |
| parent | d459c153296ff16ec49f521713ffc899f301901a (diff) | |
| download | u-boot-imx-b6fa97917c085fbbd22b16765afa6f68bdc4234d.zip u-boot-imx-b6fa97917c085fbbd22b16765afa6f68bdc4234d.tar.gz u-boot-imx-b6fa97917c085fbbd22b16765afa6f68bdc4234d.tar.bz2 | |
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: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6slevk.h | 8 | ||||
| -rw-r--r-- | include/configs/mx6ull_ddr3_arm2.h | 6 | ||||
| -rw-r--r-- | include/configs/mx7d_arm2.h | 4 | ||||
| -rw-r--r-- | include/configs/mx7dsabresd.h | 4 |
4 files changed, 8 insertions, 14 deletions
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 19f6557..5d9539b 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -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) diff --git a/include/configs/mx6ull_ddr3_arm2.h b/include/configs/mx6ull_ddr3_arm2.h index 377adac..5455fb5 100644 --- a/include/configs/mx6ull_ddr3_arm2.h +++ b/include/configs/mx6ull_ddr3_arm2.h @@ -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 */ diff --git a/include/configs/mx7d_arm2.h b/include/configs/mx7d_arm2.h index f2d639d..2e51e62 100644 --- a/include/configs/mx7d_arm2.h +++ b/include/configs/mx7d_arm2.h @@ -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 */ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 85786c2..55415e4 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -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 */ |