summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Winkler <robert.winkler@boundarydevices.com>2013-06-17 11:31:31 -0700
committerAnatolij Gustschin <agust@denx.de>2013-07-01 21:47:40 +0200
commit327598945b13000065ca6ba3fe96c9bd45320999 (patch)
tree9c84318a6a9e91332f056195ca4c2e2e03515806
parent59b15922119f79289df6714972acaeec0de1fe95 (diff)
downloadu-boot-imx-327598945b13000065ca6ba3fe96c9bd45320999.zip
u-boot-imx-327598945b13000065ca6ba3fe96c9bd45320999.tar.gz
u-boot-imx-327598945b13000065ca6ba3fe96c9bd45320999.tar.bz2
omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
-rw-r--r--board/compulab/cm_t35/cm_t35.c2
-rw-r--r--include/configs/cm_t35.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index b0b80e5..95098af 100644
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -120,7 +120,7 @@ static inline int splash_load_from_nand(void)
}
#endif /* CONFIG_CMD_NAND */
-int board_splash_screen_prepare(void)
+int splash_screen_prepare(void)
{
char *env_splashimage_value;
u32 bmp_load_addr;
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index c6e357a..b258da9 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -339,6 +339,5 @@
#define CONFIG_SPLASH_SCREEN
#define CONFIG_CMD_BMP
#define CONFIG_BMP_16BPP
-#define CONFIG_SPLASH_SCREEN_PREPARE
#endif /* __CONFIG_H */