Put the options and the common BMP code with the other related Kconfig options in the drivers/video directory.
Signed-off-by: Simon Glass sjg@chromium.org ---
(no changes since v1)
common/Kconfig | 11 ----------- common/Makefile | 1 - drivers/video/Kconfig | 11 +++++++++++ drivers/video/Makefile | 2 ++ {common => drivers/video}/bmp.c | 0 5 files changed, 13 insertions(+), 12 deletions(-) rename {common => drivers/video}/bmp.c (100%)
diff --git a/common/Kconfig b/common/Kconfig index 844531a59eda..2f46fdb3f62c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1167,14 +1167,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/common/Makefile b/common/Makefile index f5c3d90f0675..0a3f75f2f1c8 100644 --- a/common/Makefile +++ b/common/Makefile @@ -45,7 +45,6 @@ endif # !CONFIG_SPL_BUILD
obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o obj-$(CONFIG_$(SPL_TPL_)BLOBLIST) += bloblist.o -obj-$(CONFIG_$(SPL_)BMP) += bmp.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_DFU diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 09f2cb1a7321..a4befd6b655c 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -682,6 +682,11 @@ config BACKLIGHT_LM3533 LM3533 Lighting Power chip. Only Bank A is supported as for now. Supported backlight level range is from 2 to 255 with step of 1.
+config BMP + bool # Enable bmp image display + help + Enable bmp functions to display bmp image and get bmp info. + source "drivers/video/ti/Kconfig"
source "drivers/video/exynos/Kconfig" @@ -1117,6 +1122,12 @@ config SPL_VIDEO_REMOVE if this option is enabled video driver will be removed at the end of SPL stage, before loading the next stage.
+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. + if SPL_SPLASH_SCREEN
config SPL_SPLASH_SCREEN_ALIGN diff --git a/drivers/video/Makefile b/drivers/video/Makefile index d13af9f3b19b..a3182dca734b 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -3,6 +3,8 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+obj-$(CONFIG_$(SPL_)BMP) += bmp.o + ifdef CONFIG_DM obj-$(CONFIG_$(SPL_TPL_)BACKLIGHT) += backlight-uclass.o obj-$(CONFIG_BACKLIGHT_GPIO) += backlight_gpio.o diff --git a/common/bmp.c b/drivers/video/bmp.c similarity index 100% rename from common/bmp.c rename to drivers/video/bmp.c