| Message ID | 1371238293-5879-1-git-send-email-robert.winkler@boundarydevices.com |
|---|---|
| State | Superseded |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
Hi Robert, We lack a commit message here... On 06/14/13 22:31, Robert Winkler wrote: > Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> > --- Also, I would write here (not a part of commit message) that this patch should be applied only in case the patch: "video: lcd: Make splash_screen_prepare weak, remove config macro is applied. May be it is even better to make this patch the 3rd in the series changing the splash prepare stuff? > board/compulab/cm_t35/cm_t35.c | 2 +- > include/configs/cm_t35.h | 1 - > 2 files changed, 1 insertion(+), 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 */ >
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 */
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> --- board/compulab/cm_t35/cm_t35.c | 2 +- include/configs/cm_t35.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)