The bmp command already has a way to centre the image. Using this CONFIG option to also centre it makes it impossible to control where images are placed on the screen. Drop the extra check.
Simplify the Kconfig file we are here.
Signed-off-by: Simon Glass sjg@chromium.org ---
cmd/bmp.c | 4 +--- drivers/video/Kconfig | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/cmd/bmp.c b/cmd/bmp.c index 45f4c1296de..d72a826ae74 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -259,9 +259,7 @@ int bmp_display(ulong addr, int x, int y) if (!ret) { bool align = false;
- if (CONFIG_IS_ENABLED(SPLASH_SCREEN_ALIGN) || - x == BMP_ALIGN_CENTER || - y == BMP_ALIGN_CENTER) + if (x == BMP_ALIGN_CENTER || y == BMP_ALIGN_CENTER) align = true;
ret = video_bmp_display(dev, addr, x, y, align); diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 4ecc158c460..0af94e90706 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -831,9 +831,10 @@ config SPLASH_SCREEN image data before it is processed and sent to the frame buffer by U-Boot. Define your own version to use this feature.
+if SPLASH_SCREEN + config SPLASHIMAGE_GUARD bool "Support unaligned BMP images" - depends on SPLASH_SCREEN help If this option is set, then U-Boot will prevent the environment variable "splashimage" from being set to a problematic address @@ -847,7 +848,6 @@ config SPLASHIMAGE_GUARD
config SPLASH_SCREEN_ALIGN bool "Allow positioning the splash image anywhere on the display" - depends on SPLASH_SCREEN || CMD_BMP help If this option is set the splash image can be freely positioned on the screen. Environment variable "splashpos" specifies the @@ -869,7 +869,6 @@ config SPLASH_SCREEN_ALIGN
config SPLASH_SOURCE bool "Control the source of the splash image" - depends on SPLASH_SCREEN help Use the splash_source.c library. This library provides facilities to declare board specific splash image locations, routines for loading @@ -900,6 +899,8 @@ config SPLASH_SOURCE In case the environment variable "splashfile" is not defined the default name 'splash.bmp' will be used.
+endif # SPLASH_SCREEN + config VIDEO_BMP_GZIP bool "Gzip compressed BMP image support" depends on CMD_BMP || SPLASH_SCREEN