summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Winkler <robert.winkler@boundarydevices.com>2013-06-17 11:31:30 -0700
committerAnatolij Gustschin <agust@denx.de>2013-07-01 21:47:16 +0200
commit59b15922119f79289df6714972acaeec0de1fe95 (patch)
tree1c6e4baa03f16e216241e740026b6aa3ec78bc06
parentdd4425e85260c2e750676e2dc9c225cfff1b4bcd (diff)
downloadu-boot-imx-59b15922119f79289df6714972acaeec0de1fe95.zip
u-boot-imx-59b15922119f79289df6714972acaeec0de1fe95.tar.gz
u-boot-imx-59b15922119f79289df6714972acaeec0de1fe95.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>
-rw-r--r--README8
-rw-r--r--common/splash.c13
-rw-r--r--doc/README.splashprepare8
3 files changed, 12 insertions, 17 deletions
diff --git a/README b/README
index 5c343da..40ffd64 100644
--- a/README
+++ b/README
@@ -1642,14 +1642,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.