diff options
| author | Ye.Li <B37916@freescale.com> | 2015-03-26 15:41:52 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2015-03-27 16:52:25 +0800 |
| commit | 4d55a4124be3a3a6288c3c845d17fd9d4f2b8b43 (patch) | |
| tree | 2d08a25902a50c640b7fa1e59d557df6a4c536ef /include/configs | |
| parent | 0aa21a0b43ac54c43635b130c7b4902dc5263890 (diff) | |
| download | u-boot-imx-4d55a4124be3a3a6288c3c845d17fd9d4f2b8b43.zip u-boot-imx-4d55a4124be3a3a6288c3c845d17fd9d4f2b8b43.tar.gz u-boot-imx-4d55a4124be3a3a6288c3c845d17fd9d4f2b8b43.tar.bz2 | |
MLK-10478 mx6: EPDC: Improve EPDC usage and configuration
Change to load EPDC waveform from FAT partition and allocate waveform
buffer, framebuffer and working buffer in dynamic manner not static.
So many EPDC configurations are removed.
To enable the EPDC feature, must define CONFIG_MXC_EPDC and CONFIG_SPLASH_SCREEN.
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 5 | ||||
| -rw-r--r-- | include/configs/mx6sabresd.h | 14 | ||||
| -rw-r--r-- | include/configs/mx6slevk.h | 19 |
3 files changed, 9 insertions, 29 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 93d4c4b..be7808d 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Freescale Semiconductor, Inc. + * Copyright (C) 2012-2015 Freescale Semiconductor, Inc. * * Configuration settings for the Freescale i.MX6Q SabreSD board. * @@ -37,7 +37,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT @@ -155,6 +155,7 @@ #else #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ + "epdc_waveform=epdc_splash.bin\0" \ "script=boot.scr\0" \ "image=zImage\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 9f3fae7..99aa6b4 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Freescale Semiconductor, Inc. + * Copyright (C) 2012-2015 Freescale Semiconductor, Inc. * * Configuration settings for the Freescale i.MX6Q SabreSD board. * @@ -72,23 +72,13 @@ */ #define CONFIG_CMD_BMP #define CONFIG_LCD - #define CONFIG_FB_BASE (CONFIG_SYS_TEXT_BASE + 0x300000) #define CONFIG_SYS_CONSOLE_IS_IN_ENV #undef LCD_TEST_PATTERN /* #define CONFIG_SPLASH_IS_IN_MMC 1 */ #define LCD_BPP LCD_MONOCHROME /* #define CONFIG_SPLASH_SCREEN_ALIGN 1 */ - #define CONFIG_WORKING_BUF_ADDR (CONFIG_SYS_TEXT_BASE + 0x100000) - #define CONFIG_WAVEFORM_BUF_ADDR (CONFIG_SYS_TEXT_BASE + 0x200000) - #define CONFIG_WAVEFORM_FILE_OFFSET 0x600000 - #define CONFIG_WAVEFORM_FILE_SIZE 0xF0A00 - #define CONFIG_WAVEFORM_FILE_IN_MMC - -#ifdef CONFIG_SPLASH_IS_IN_MMC - #define CONFIG_SPLASH_IMG_OFFSET 0x4c000 - #define CONFIG_SPLASH_IMG_SIZE 0x19000 -#endif + #define CONFIG_WAVEFORM_BUF_SIZE 0x200000 #endif /* CONFIG_SPLASH_SCREEN && CONFIG_MXC_EPDC */ #endif /* __MX6QSABRESD_CONFIG_H */ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 834e710..17eea59 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. + * Copyright (C) 2013-2015 Freescale Semiconductor, Inc. * * Configuration settings for the Freescale i.MX6SL EVK board. * @@ -34,7 +34,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT @@ -111,6 +111,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ + "epdc_waveform=epdc_splash.bin\0" \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ @@ -275,24 +276,12 @@ #define CONFIG_CMD_BMP #define CONFIG_MXC_EPDC 1 #define CONFIG_LCD - #define CONFIG_FB_BASE (CONFIG_SYS_TEXT_BASE + 0x300000) #define CONFIG_SYS_CONSOLE_IS_IN_ENV #ifdef CONFIG_MXC_EPDC #undef LCD_TEST_PATTERN - /* #define CONFIG_SPLASH_IS_IN_MMC 1 */ #define LCD_BPP LCD_MONOCHROME - /* #define CONFIG_SPLASH_SCREEN_ALIGN 1 */ - #define CONFIG_WORKING_BUF_ADDR (CONFIG_SYS_TEXT_BASE + 0x100000) - #define CONFIG_WAVEFORM_BUF_ADDR (CONFIG_SYS_TEXT_BASE + 0x200000) - #define CONFIG_WAVEFORM_FILE_OFFSET 0x600000 - #define CONFIG_WAVEFORM_FILE_SIZE 0xF0A00 - #define CONFIG_WAVEFORM_FILE_IN_MMC - -#ifdef CONFIG_SPLASH_IS_IN_MMC - #define CONFIG_SPLASH_IMG_OFFSET 0x4c000 - #define CONFIG_SPLASH_IMG_SIZE 0x19000 -#endif + #define CONFIG_WAVEFORM_BUF_SIZE 0x200000 #endif #endif /* CONFIG_SPLASH_SCREEN */ |