Hi Nikhil,
Thanks for the patch. I think good to squash similar patches to CONFIG_BMP together. On 29/03/23 17:31, Nikhil M Jain wrote:
Replace CONFIG_CMD_BMP with CONFIG_BMP to enable splash_display function at u-boot proper and SPL.
Signed-off-by: Nikhil M Jain n-jain1@ti.com
V4:
- No change
V3 (patch introduced):
- Replace CONFIG_CMD_BMP with CONFIG_BMP
common/splash.c | 2 +- include/splash.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/splash.c b/common/splash.c index 9bb2c1121e..a1dd872f59 100644 --- a/common/splash.c +++ b/common/splash.c @@ -157,7 +157,7 @@ void splash_display_banner(void)
- Common function to show a splash image if env("splashimage") is set.
- For additional details please refer to doc/README.splashprepare.
*/ -#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) +#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && CONFIG_IS_ENABLED(BMP)
This seems to break backward compatibility for platforms who only use CONFIG_CMD_BMP. I think you can use CONFIG_CMD_BMP orred with CONFIG_SPL_BMP
Regards Devarsh
int splash_display(void) { ulong addr; diff --git a/include/splash.h b/include/splash.h index 6adde9148c..b6a100ffc3 100644 --- a/include/splash.h +++ b/include/splash.h @@ -67,7 +67,7 @@ void splash_get_pos(int *x, int *y); static inline void splash_get_pos(int *x, int *y) { } #endif
-#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) +#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && CONFIG_IS_ENABLED(BMP) int splash_display(void); #else static inline int splash_display(void)