[PATCH 13/14] video: Convert CONFIG_VIDEO_BCM2835 to Kconfig

[Matthias Brugger]

On 23/01/2022 15:04, Simon Glass wrote:
> This converts the following to Kconfig:
>     CONFIG_VIDEO_BCM2835
> 
> This is the final ad-hoc CONFIG_VIDEO_... to convert.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Acked-by: Matthias Brugger <mbrugger at suse.com>

> ---
> 
>   configs/rpi_0_w_defconfig      | 1 +
>   configs/rpi_2_defconfig        | 1 +
>   configs/rpi_3_32b_defconfig    | 1 +
>   configs/rpi_3_b_plus_defconfig | 1 +
>   configs/rpi_3_defconfig        | 1 +
>   configs/rpi_4_32b_defconfig    | 1 +
>   configs/rpi_4_defconfig        | 1 +
>   configs/rpi_arm64_defconfig    | 1 +
>   configs/rpi_defconfig          | 1 +
>   drivers/video/Kconfig          | 8 ++++++++
>   include/configs/rpi.h          | 1 -
>   scripts/config_whitelist.txt   | 1 -
>   12 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
> index 195541c6e76..819618280f7 100644
> --- a/configs/rpi_0_w_defconfig
> +++ b/configs/rpi_0_w_defconfig
> @@ -41,6 +41,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
> index eb63fbdd8d9..9ccd69cbd88 100644
> --- a/configs/rpi_2_defconfig
> +++ b/configs/rpi_2_defconfig
> @@ -42,6 +42,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
> index 46102899f03..de4a14e69ce 100644
> --- a/configs/rpi_3_32b_defconfig
> +++ b/configs/rpi_3_32b_defconfig
> @@ -45,6 +45,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
> index 91b63b62721..1d4346c0ec8 100644
> --- a/configs/rpi_3_b_plus_defconfig
> +++ b/configs/rpi_3_b_plus_defconfig
> @@ -44,6 +44,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
> index 528b12ea5b5..c7615403d33 100644
> --- a/configs/rpi_3_defconfig
> +++ b/configs/rpi_3_defconfig
> @@ -44,6 +44,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
> index 8f87a4336d2..d9d9331f580 100644
> --- a/configs/rpi_4_32b_defconfig
> +++ b/configs/rpi_4_32b_defconfig
> @@ -59,6 +59,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_ADDR_MAP=y
> diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
> index 461a7655ab9..eac55ccbcb8 100644
> --- a/configs/rpi_4_defconfig
> +++ b/configs/rpi_4_defconfig
> @@ -59,6 +59,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
> index 351d247daeb..a0cbdbef02f 100644
> --- a/configs/rpi_arm64_defconfig
> +++ b/configs/rpi_arm64_defconfig
> @@ -51,6 +51,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
> index 0baef3b6abf..bd4e3dc42d7 100644
> --- a/configs/rpi_defconfig
> +++ b/configs/rpi_defconfig
> @@ -41,6 +41,7 @@ CONFIG_DM_VIDEO=y
>   # CONFIG_VIDEO_BPP8 is not set
>   # CONFIG_VIDEO_BPP16 is not set
>   CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_BCM2835=y
>   CONFIG_CONSOLE_SCROLL_LINES=10
>   CONFIG_PHYS_TO_BUS=y
>   CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index e74a3dd9285..2fba1f2e122 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -421,6 +421,14 @@ config VIDEO_LCD_ANX9804
>   	from a parallel LCD interface and translate it on the fy into a DP
>   	interface for driving eDP TFT displays. It uses I2C for configuration.
>   
> +config VIDEO_BCM2835
> +	bool "Display support for BCM2835"
> +	help
> +	  The graphics processor already sets up the display so this driver
> +	  simply checks the resolution and then sets up the frame buffer with
> +	  that same resolution (or as near as possible) and 32bpp depth, so
> +	  that U-Boot can access it with full colour depth.
> +
>   config VIDEO_LCD_ORISETECH_OTM8009A
>   	bool "OTM8009A DSI LCD panel support"
>   	depends on DM_VIDEO
> diff --git a/include/configs/rpi.h b/include/configs/rpi.h
> index d5e064fb379..c439ec1b302 100644
> --- a/include/configs/rpi.h
> +++ b/include/configs/rpi.h
> @@ -44,7 +44,6 @@
>   /* GPIO */
>   #define CONFIG_BCM2835_GPIO
>   /* LCD */
> -#define CONFIG_VIDEO_BCM2835
>   
>   /* DFU over USB/UDC */
>   #ifdef CONFIG_CMD_DFU
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 1edee279c4e..28702543087 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2111,7 +2111,6 @@ CONFIG_USE_ONENAND_BOARD_INIT
>   CONFIG_U_BOOT_HDR_SIZE
>   CONFIG_VAR_SIZE_SPL
>   CONFIG_VERY_BIG_RAM
> -CONFIG_VIDEO_BCM2835
>   CONFIG_VSC7385_ENET
>   CONFIG_VSC7385_IMAGE
>   CONFIG_VSC7385_IMAGE_SIZE