]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
video: lcd: Make splash_screen_prepare weak, remove config macro
authorRobert Winkler <robert.winkler@boundarydevices.com>
Mon, 17 Jun 2013 18:31:30 +0000 (11:31 -0700)
committerAnatolij Gustschin <agust@denx.de>
Mon, 1 Jul 2013 19:47:16 +0000 (21:47 +0200)
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>
README
common/splash.c
doc/README.splashprepare [new file with mode: 0644]

diff --git a/README b/README
index 5c343da32bdf581420c0d18e5cea3cac49c8f9e3..40ffd6422ee022804dd9e804fe3726a3d3eedd4f 100644 (file)
--- 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
index 5cf52723a565980c19b744299c1e84ab58d635c0..c7444977ed7fad566e5322520b99ea53f7e42e9e 100644 (file)
  */
 
 #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 (file)
index 0000000..61b4ec5
--- /dev/null
@@ -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.