diff options
| author | Robert Winkler <robert.winkler@boundarydevices.com> | 2013-06-17 11:31:30 -0700 |
|---|---|---|
| committer | Liu Ying <Ying.Liu@freescale.com> | 2013-11-22 17:27:15 +0800 |
| commit | 4ace33edd0798c0974c94289d1771c844a4adc57 (patch) | |
| tree | 7c0da31474dbcee0b0c7a8ea9a06845985e77784 | |
| parent | 715f2bd7ef2df4c395fdb0463d842e3f093c594a (diff) | |
| download | u-boot-imx-4ace33edd0798c0974c94289d1771c844a4adc57.zip u-boot-imx-4ace33edd0798c0974c94289d1771c844a4adc57.tar.gz u-boot-imx-4ace33edd0798c0974c94289d1771c844a4adc57.tar.bz2 | |
video: lcd: Make splash_screen_prepare weak, remove config macro
Remove CONFIG_SPLASH_SCREEN_PREPARE from README
Add doc/README.splashprepare to document functionality
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
(cherry picked from commit 59b15922119f79289df6714972acaeec0de1fe95)
Signed-off-by: Jason Liu <r64343@freescale.com>
(cherry picked from commit 4117088dfcb88b20808561698af0144d05fb6eb5)
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | common/splash.c | 13 | ||||
| -rw-r--r-- | doc/README.splashprepare | 8 |
3 files changed, 12 insertions, 17 deletions
@@ -1597,14 +1597,6 @@ CBFS (Coreboot Filesystem) support => vertically centered image at x = dspWidth - bmpWidth - 9 - CONFIG_SPLASH_SCREEN_PREPARE - - If this option is set then the board_splash_screen_prepare() - function, which must be defined in your code, is called as part - of the splash screen display sequence. It gives the board an - opportunity to prepare the splash image data before it is - processed and sent to the frame buffer by U-Boot. - - Gzip compressed BMP image support: CONFIG_VIDEO_BMP_GZIP If this option is set, additionally to standard BMP diff --git a/common/splash.c b/common/splash.c index 5cf5272..c744497 100644 --- a/common/splash.c +++ b/common/splash.c @@ -21,16 +21,11 @@ */ #include <splash.h> -#include <config.h> -#ifdef CONFIG_SPLASH_SCREEN_PREPARE -int splash_screen_prepare(void) -{ - return board_splash_screen_prepare(); -} -#else -int splash_screen_prepare(void) +int __splash_screen_prepare(void) { return 0; } -#endif + +int splash_screen_prepare(void) + __attribute__ ((weak, alias("__splash_screen_prepare"))); diff --git a/doc/README.splashprepare b/doc/README.splashprepare new file mode 100644 index 0000000..61b4ec5 --- /dev/null +++ b/doc/README.splashprepare @@ -0,0 +1,8 @@ +--------------------------------------------------------------------- +Splash Screen +--------------------------------------------------------------------- +The splash_screen_prepare() function is a weak function defined in +common/splash.c. It is called as part of the splash screen display +sequence. It gives the board an opportunity to prepare the splash +image data before it is processed and sent to the frame buffer by +U-Boot. Define your own version to use this feature. |