[PATCH 1/7] Convert CONFIG_LCD_DT_SIMPLEFB to Kconfig

Mon Nov 15 16:46:59 CET 2021


On 15/11/2021 16:32, Patrick Delaunay wrote:
> This converts the following to Kconfig:
>     CONFIG_LCD_DT_SIMPLEFB
> 
> This patch also renames this config to CONFIG_FDT_SIMPLEFB as the code in
> common/lcd_simplefb.c support CONFIG_LCD and CONFIG_VIDEO.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>

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

> ---
> 
>   common/Kconfig                 | 9 +++++++++
>   common/Makefile                | 2 +-
>   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 +
>   include/configs/rpi.h          | 1 -
>   scripts/config_whitelist.txt   | 1 -
>   13 files changed, 19 insertions(+), 3 deletions(-)
> 
> diff --git a/common/Kconfig b/common/Kconfig
> index fdcf4536d0..c97814c6ad 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -766,3 +766,12 @@ config SPL_IMAGE_SIGN_INFO
>   	  Enable image_sign_info helper functions in SPL.
>   
>   endif
> +
> +config FDT_SIMPLEFB
> +	bool "FDT tools for simplefb support"
> +	depends on OF_LIBFDT
> +	help
> +	  Enable the fdt tools to manage the simple fb nodes in device tree.
> +	  These functions can be used by board to indicate to the OS
> +	  the presence of the simple frame buffer with associated reserved
> +	  memory
> diff --git a/common/Makefile b/common/Makefile
> index c500bcd7d8..fed7e482e6 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -40,7 +40,7 @@ ifndef CONFIG_DM_VIDEO
>   obj-$(CONFIG_LCD) += lcd.o lcd_console.o
>   endif
>   obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o
> -obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
> +obj-$(CONFIG_FDT_SIMPLEFB) += lcd_simplefb.o
>   obj-$(CONFIG_MENU) += menu.o
>   obj-$(CONFIG_UPDATE_COMMON) += update.o
>   obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
> diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
> index 6d76d12910..195541c6e7 100644
> --- a/configs/rpi_0_w_defconfig
> +++ b/configs/rpi_0_w_defconfig
> @@ -13,6 +13,7 @@ CONFIG_USE_PREBOOT=y
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_MMC=y
> diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
> index 1931607132..eb63fbdd8d 100644
> --- a/configs/rpi_2_defconfig
> +++ b/configs/rpi_2_defconfig
> @@ -14,6 +14,7 @@ CONFIG_USE_PREBOOT=y
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_MMC=y
> diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
> index 060fd36da5..46102899f0 100644
> --- a/configs/rpi_3_32b_defconfig
> +++ b/configs/rpi_3_32b_defconfig
> @@ -15,6 +15,7 @@ CONFIG_USE_PREBOOT=y
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_MMC=y
> diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
> index 0a69f97342..91b63b6272 100644
> --- a/configs/rpi_3_b_plus_defconfig
> +++ b/configs/rpi_3_b_plus_defconfig
> @@ -14,6 +14,7 @@ CONFIG_USE_PREBOOT=y
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_MMC=y
> diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
> index 8016fe1d55..528b12ea5b 100644
> --- a/configs/rpi_3_defconfig
> +++ b/configs/rpi_3_defconfig
> @@ -14,6 +14,7 @@ CONFIG_USE_PREBOOT=y
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_MMC=y
> diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
> index 990589de64..88f7504a60 100644
> --- a/configs/rpi_4_32b_defconfig
> +++ b/configs/rpi_4_32b_defconfig
> @@ -12,6 +12,7 @@ CONFIG_PREBOOT="pci enum; usb start;"
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_DFU=y
>   CONFIG_CMD_GPIO=y
> diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
> index 0720505c6a..59a7103154 100644
> --- a/configs/rpi_4_defconfig
> +++ b/configs/rpi_4_defconfig
> @@ -12,6 +12,7 @@ CONFIG_PREBOOT="pci enum; usb start;"
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_DFU=y
>   CONFIG_CMD_GPIO=y
> diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
> index 06ae3e93b2..67dbf094ef 100644
> --- a/configs/rpi_arm64_defconfig
> +++ b/configs/rpi_arm64_defconfig
> @@ -12,6 +12,7 @@ CONFIG_PREBOOT="pci enum; usb start;"
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_MMC=y
> diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
> index 8acf04d0e4..0baef3b6ab 100644
> --- a/configs/rpi_defconfig
> +++ b/configs/rpi_defconfig
> @@ -13,6 +13,7 @@ CONFIG_USE_PREBOOT=y
>   # CONFIG_DISPLAY_CPUINFO is not set
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
> +CONFIG_FDT_SIMPLEFB=y
>   CONFIG_SYS_PROMPT="U-Boot> "
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_MMC=y
> diff --git a/include/configs/rpi.h b/include/configs/rpi.h
> index 55768a46da..bc907acd5f 100644
> --- a/include/configs/rpi.h
> +++ b/include/configs/rpi.h
> @@ -44,7 +44,6 @@
>   /* GPIO */
>   #define CONFIG_BCM2835_GPIO
>   /* LCD */
> -#define CONFIG_LCD_DT_SIMPLEFB
>   #define CONFIG_VIDEO_BCM2835
>   
>   /* DFU over USB/UDC */
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index b9c1c61e13..1e1ef76175 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -699,7 +699,6 @@ CONFIG_LBA48
>   CONFIG_LBDAF
>   CONFIG_LCD_ALIGNMENT
>   CONFIG_LCD_BMP_RLE8
> -CONFIG_LCD_DT_SIMPLEFB
>   CONFIG_LCD_INFO
>   CONFIG_LCD_INFO_BELOW_LOGO
>   CONFIG_LCD_IN_PSRAM
>