diff options
| -rw-r--r-- | configs/mx6slevk_epdc_defconfig | 4 | ||||
| -rw-r--r-- | configs/mx6ull_14x14_ddr3_arm2_epdc_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7d_12x12_lpddr3_arm2_epdc_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7dsabresd_epdc_defconfig | 1 | ||||
| -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 |
8 files changed, 14 insertions, 15 deletions
diff --git a/configs/mx6slevk_epdc_defconfig b/configs/mx6slevk_epdc_defconfig index 5a8a3e0..845bc70 100644 --- a/configs/mx6slevk_epdc_defconfig +++ b/configs/mx6slevk_epdc_defconfig @@ -1,7 +1,7 @@ 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 diff --git a/configs/mx6ull_14x14_ddr3_arm2_epdc_defconfig b/configs/mx6ull_14x14_ddr3_arm2_epdc_defconfig index 6008d45..9f9d682 100644 --- a/configs/mx6ull_14x14_ddr3_arm2_epdc_defconfig +++ b/configs/mx6ull_14x14_ddr3_arm2_epdc_defconfig @@ -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" diff --git a/configs/mx7d_12x12_lpddr3_arm2_epdc_defconfig b/configs/mx7d_12x12_lpddr3_arm2_epdc_defconfig index 296d7a2..d0f5bf1 100644 --- a/configs/mx7d_12x12_lpddr3_arm2_epdc_defconfig +++ b/configs/mx7d_12x12_lpddr3_arm2_epdc_defconfig @@ -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 diff --git a/configs/mx7dsabresd_epdc_defconfig b/configs/mx7dsabresd_epdc_defconfig index b3e126c..02f7dcf 100644 --- a/configs/mx7dsabresd_epdc_defconfig +++ b/configs/mx7dsabresd_epdc_defconfig @@ -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 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 */ |