video: Move the BMP options

These appear prominently in the main menu at present. Move them to the
video Kconfig where they belong.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/common/Kconfig b/common/Kconfig
index d916194b9423fd5972c3ca4311070cdc7b89d4b4..d11292f52c2befce540834f189462d34cd6dfe71 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1168,14 +1168,3 @@ config FDT_SIMPLEFB
 
 config IO_TRACE
        bool
-
-config BMP
-       bool "Enable bmp image display"
-       help
-         Enable bmp functions to display bmp image and get bmp info.
-
-config SPL_BMP
-       bool "Enable bmp image display at SPL"
-       depends on SPL_VIDEO
-       help
-         Enable bmp functions to display bmp image and get bmp info at SPL.

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 09f2cb1a732135089faf8532c90c49d4452b9b94..ab927641bb7ab948d6ddd701483201dfcc473cb1 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -959,6 +959,14 @@ config SPLASH_SOURCE
 
 endif # SPLASH_SCREEN
 
+config BMP
+       bool "Enable bmp image display"
+       help
+         Enable bmp functions to display bmp image and get bmp info.
+
+         BMP is a simple graphics-image file format designed to store bitmap
+         images. It is primarily used on Windows devices.
+
 config VIDEO_BMP_GZIP
        bool "Gzip compressed BMP image support"
        depends on BMP || SPLASH_SCREEN
@@ -1162,6 +1170,14 @@ config SPL_SPLASH_SOURCE
 
 endif # SPL_SPLASH_SCREEN
 
+config SPL_BMP
+       bool "Enable bmp image display at SPL"
+       help
+         Enable bmp functions to display bmp image and get bmp info in SPL.
+
+         BMP is a simple graphics-image file format designed to store bitmap
+         images. It is primarily used on Windows devices.
+
 config SPL_VIDEO_BMP_GZIP
        bool "Gzip compressed BMP image support at SPL"
        depends on SPL_SPLASH_SCREEN || SPL_BMP