[U-Boot] [PATCH v4 23/29] Convert CONFIG_LCD to Kconfig

This converts the following to Kconfig: CONFIG_LCD

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

Changes in v4: None Changes in v3: None Changes in v2: None

configs/TQM823L_LCD_defconfig | 3 ++- configs/TTTech_defconfig | 3 ++- configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9263ek_dataflash_cs0_defconfig | 1 + configs/at91sam9263ek_dataflash_defconfig | 1 + configs/at91sam9263ek_nandflash_defconfig | 1 + configs/at91sam9263ek_norflash_boot_defconfig | 1 + configs/at91sam9263ek_norflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 + configs/at91sam9g10ek_nandflash_defconfig | 1 + configs/at91sam9m10g45ek_mmc_defconfig | 1 + configs/at91sam9m10g45ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_mmc_defconfig | 1 + configs/at91sam9n12ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_spiflash_defconfig | 1 + configs/at91sam9rlek_dataflash_defconfig | 1 + configs/at91sam9rlek_mmc_defconfig | 1 + configs/at91sam9rlek_nandflash_defconfig | 1 + configs/at91sam9x5ek_dataflash_defconfig | 1 + configs/at91sam9x5ek_mmc_defconfig | 1 + configs/at91sam9x5ek_nandflash_defconfig | 1 + configs/at91sam9x5ek_spiflash_defconfig | 1 + configs/brppt1_mmc_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/brppt1_spi_defconfig | 1 + configs/brxre1_defconfig | 1 + configs/cm_t3517_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/pm9261_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + configs/sama5d3xek_mmc_defconfig | 1 + configs/sama5d3xek_nandflash_defconfig | 1 + configs/sama5d3xek_spiflash_defconfig | 1 + configs/sama5d4ek_mmc_defconfig | 1 + configs/sama5d4ek_nandflash_defconfig | 1 + configs/sama5d4ek_spiflash_defconfig | 1 + configs/snow_defconfig | 1 + configs/spring_defconfig | 1 + configs/wtk_defconfig | 3 ++- configs/zipitz2_defconfig | 1 + drivers/video/Kconfig | 8 ++++++++ include/configs/M52277EVB.h | 1 - include/configs/at91sam9261ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/brppt1.h | 1 - include/configs/brxre1.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/exynos5-dt-common.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/peach-pi.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/rpi.h | 1 - include/configs/sama5d2_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/smdk5250.h | 1 - include/configs/smdk5420.h | 1 - include/configs/zipitz2.h | 1 - scripts/config_whitelist.txt | 1 - 77 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig index 38f5119..9bc8c73 100644 --- a/configs/TQM823L_LCD_defconfig +++ b/configs/TQM823L_LCD_defconfig @@ -2,7 +2,7 @@ CONFIG_PPC=y CONFIG_8xx=y CONFIG_TARGET_TQM823L=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="LCD,NEC_NL6448BC20" +CONFIG_SYS_EXTRA_OPTIONS="NEC_NL6448BC20" CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y @@ -10,4 +10,5 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_EXT2=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig index e545848..9649012 100644 --- a/configs/TTTech_defconfig +++ b/configs/TTTech_defconfig @@ -2,7 +2,7 @@ CONFIG_PPC=y CONFIG_8xx=y CONFIG_TARGET_TQM823L=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ104V7DS01" +CONFIG_SYS_EXTRA_OPTIONS="SHARP_LQ104V7DS01" CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y @@ -10,4 +10,5 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_EXT2=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig index 31c18e5..aed1e74 100644 --- a/configs/at91sam9261ek_dataflash_cs0_defconfig +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig index 3338e4b..d5a23f8 100644 --- a/configs/at91sam9261ek_dataflash_cs3_defconfig +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig index 92c2a73..4ca9fdc 100644 --- a/configs/at91sam9261ek_nandflash_defconfig +++ b/configs/at91sam9261ek_nandflash_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig index 7f1a6e5..b99ca91 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -22,4 +22,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig index 7f1a6e5..b99ca91 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -22,4 +22,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig index c17f702..444f8ae 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -22,4 +22,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index f6d8a63..5ad1c69 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -22,4 +22,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index 2e056de..a9a3d1b 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -22,4 +22,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig index 4e1d27b..1f1b624 100644 --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig index e6b59da..7c5548a 100644 --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig index efa4101..85077c7 100644 --- a/configs/at91sam9g10ek_nandflash_defconfig +++ b/configs/at91sam9g10ek_nandflash_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index c655c81..7c7db6b 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -30,4 +30,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index e1d8a17..deffaaf 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -28,4 +28,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 63b5ba3..73a36ec 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -22,4 +22,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 2914685..3131641 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -28,4 +28,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index c248b2e..40c9856 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -29,4 +29,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index e1597aa..b1b6dd4 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_FAT=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 443f06f..ea7ef47 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_FAT=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index 9450da9..34ddd39 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_FAT=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index 516f54b..7625b92 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -24,4 +24,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 0a181b4..e60130b 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -24,4 +24,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index a6204b6..a4356ab 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -30,4 +30,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 9b1238e..1663aad 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -31,4 +31,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index 7277cd1..336ef02 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -47,4 +47,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index 3e02895..22e43bc 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -47,4 +47,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index d7d0f66..230af46 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -55,4 +55,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 5acc776..4f91ec7 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -46,5 +46,6 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index b131b27..3bca796 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -23,4 +23,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 9a2f624..0fbc08b 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -24,4 +24,5 @@ CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index e5f34a1..df160ae 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -67,5 +67,6 @@ CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y +CONFIG_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index ddcb451..abc23c4 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -67,5 +67,6 @@ CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y +CONFIG_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig index 8f6a959..351088f 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_defconfig @@ -31,4 +31,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index b70263a..609547f 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -18,3 +18,4 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 7ffde4b..be58975 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -17,3 +17,4 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index ae391d4..13016c1 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -23,5 +23,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 802ac3b..e27d24c 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -25,5 +25,6 @@ CONFIG_CMD_FS_GENERIC=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 5971877..9536bd8 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -24,5 +24,6 @@ CONFIG_CMD_FS_GENERIC=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index e863e5e..3c8fdc2 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -23,5 +23,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index 075c8d1..e889918 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -32,4 +32,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 0a05932..4fd0795 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -30,4 +30,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index 3ca8fbf..26dd5b1 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -31,4 +31,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index 562d21f..917f351 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -33,4 +33,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 7490332..85a2175 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -31,4 +31,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 00a870b..7775a22 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -32,4 +32,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index a5754f8..c5d8d39 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -75,5 +75,6 @@ CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y +CONFIG_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 0c394c8..8aab175 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -74,5 +74,6 @@ CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y +CONFIG_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig index 336d8e4..3e4f386 100644 --- a/configs/wtk_defconfig +++ b/configs/wtk_defconfig @@ -2,7 +2,7 @@ CONFIG_PPC=y CONFIG_8xx=y CONFIG_TARGET_TQM823L=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ065T9DR51U" +CONFIG_SYS_EXTRA_OPTIONS="SHARP_LQ065T9DR51U" CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y @@ -10,4 +10,5 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_EXT2=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index d9819a5..5899215 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -15,5 +15,6 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 83dc5c8..ee3f27a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -562,4 +562,12 @@ config SYS_CONSOLE_FG_COL the background and foreground to the same colour or you will see nothing.

+config LCD + bool "Enable legacy LCD support" + help + Define this to enable LCD support (for output to LCD display). + You will also need to select an LCD driver using an additional + CONFIG option. See the README for details. Drives which have been + converted to driver model will instead used CONFIG_DM_VIDEO. + endmenu diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 898ed7d..6230948 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -84,7 +84,6 @@

/* LCD */ #ifdef CONFIG_CMD_BMP -#define CONFIG_LCD #define CONFIG_SPLASH_SCREEN #define CONFIG_LCD_LOGO #define CONFIG_SHARP_LQ035Q7DH06 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 39d81e4..cc37236 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -47,7 +47,6 @@ #define CONFIG_BAUDRATE 115200

/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR8 #define CONFIG_LCD_LOGO #undef LCD_TEST_PATTERN diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 7c169e9..cc1695e 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -57,7 +57,6 @@ #define CONFIG_BAUDRATE 115200

/* LCD */ -#define CONFIG_LCD 1 #define LCD_BPP LCD_COLOR8 #define CONFIG_LCD_LOGO 1 #undef LCD_TEST_PATTERN diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 9945bd1..5e37e2a 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -40,7 +40,6 @@ #define CONFIG_USART_ID ATMEL_ID_SYS

/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR8 #define CONFIG_LCD_LOGO #undef LCD_TEST_PATTERN diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 424dda6..7fddf4f 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -39,7 +39,6 @@ #define CONFIG_BAUDRATE 115200

/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR16 #define LCD_OUTPUT_BPP 24 #define CONFIG_LCD_LOGO diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 08fd8c4..5b3a3d1 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -44,7 +44,6 @@ #define CONFIG_BAUDRATE 115200

/* LCD */ -#define CONFIG_LCD 1 #define LCD_BPP LCD_COLOR8 #define CONFIG_LCD_LOGO 1 #undef LCD_TEST_PATTERN diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index c5d50e2..db9bdef 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -35,7 +35,6 @@ #define CONFIG_USART_ID ATMEL_ID_SYS

/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR16 #define LCD_OUTPUT_BPP 24 #define CONFIG_LCD_LOGO diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index ccc5bb4..0e13864 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -16,7 +16,6 @@ #include <configs/bur_am335x_common.h> /* ------------------------------------------------------------------------- */ #define CONFIG_AM335X_LCD -#define CONFIG_LCD #define CONFIG_LCD_ROTATION #define CONFIG_LCD_DT_SIMPLEFB #define CONFIG_SYS_WHITE_ON_BLACK diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 1e8426f..b9f69be 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -16,7 +16,6 @@ #include <configs/bur_am335x_common.h> /* ------------------------------------------------------------------------- */ #define CONFIG_AM335X_LCD -#define CONFIG_LCD #define CONFIG_LCD_NOSTDOUT #define CONFIG_SYS_WHITE_ON_BLACK #define LCD_BPP LCD_COLOR32 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 4ffaded..6caac1d 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -280,7 +280,6 @@ #define CONFIG_VIDEO_OMAP3 #define LCD_BPP LCD_COLOR16

-#define CONFIG_LCD #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SOURCE #define CONFIG_CMD_BMP diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index c1d7538..edb52be 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -281,7 +281,6 @@ #define CONFIG_VIDEO_OMAP3 #define LCD_BPP LCD_COLOR16

-#define CONFIG_LCD #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASHIMAGE_GUARD #define CONFIG_CMD_BMP diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h index 3d81f94..7cb3a29 100644 --- a/include/configs/exynos5-dt-common.h +++ b/include/configs/exynos5-dt-common.h @@ -27,7 +27,6 @@ #define CONFIG_BOARD_COMMON

/* Display */ -#define CONFIG_LCD #ifdef CONFIG_LCD #define CONFIG_EXYNOS_FB #define CONFIG_EXYNOS_DP diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 8fe5db6..91037d6 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -21,7 +21,6 @@ */ #define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE -/*#define CONFIG_LCD*/

/* * Memory configurations diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h index b01fe4c..296d77a 100644 --- a/include/configs/peach-pi.h +++ b/include/configs/peach-pi.h @@ -30,7 +30,6 @@ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"

/* Display */ -#define CONFIG_LCD #ifdef CONFIG_LCD #define CONFIG_EXYNOS_FB #define CONFIG_EXYNOS_DP diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 63fe444..64db0da 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -43,7 +43,6 @@ #define CONFIG_USART_ID ATMEL_ID_SYS

/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR8 #define CONFIG_LCD_LOGO #undef LCD_TEST_PATTERN diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 4793b13..c19e7dc 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -149,7 +149,6 @@ #define CONFIG_USART_ID ATMEL_ID_SYS

/* LCD */ -#define CONFIG_LCD 1 #define LCD_BPP LCD_COLOR8 #define CONFIG_LCD_LOGO 1 #undef LCD_TEST_PATTERN diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index db38b73..eddc81a 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -162,7 +162,6 @@ #define CONFIG_USART_ID ATMEL_ID_SYS

/* LCD */ -#define CONFIG_LCD 1 #define LCD_BPP LCD_COLOR8 #define CONFIG_LCD_LOGO 1 #undef LCD_TEST_PATTERN diff --git a/include/configs/rpi.h b/include/configs/rpi.h index decf35a..4ad98e1 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -71,7 +71,6 @@ /* GPIO */ #define CONFIG_BCM2835_GPIO /* LCD */ -#define CONFIG_LCD #define CONFIG_LCD_DT_SIMPLEFB #define LCD_BPP LCD_COLOR16 /* diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index c20d6f9..30fb9a4 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -86,7 +86,6 @@ #define CONFIG_MACB_SEARCH_PHY

/* LCD */ -/* #define CONFIG_LCD */

#ifdef CONFIG_LCD #define LCD_BPP LCD_COLOR16 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index c149e5b..1b053a6 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -39,7 +39,6 @@ #define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP

/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR16 #define LCD_OUTPUT_BPP 24 #define CONFIG_LCD_LOGO diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 0890cf5..249e661 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -94,7 +94,6 @@ #define CONFIG_MACB_SEARCH_PHY

/* LCD */ -/* #define CONFIG_LCD */ #ifdef CONFIG_LCD #define LCD_BPP LCD_COLOR16 #define LCD_OUTPUT_BPP 24 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 36da48c..00ed400 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -94,7 +94,6 @@ #define CONFIG_MACB_SEARCH_PHY

/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR16 #define LCD_OUTPUT_BPP 18 #define CONFIG_LCD_LOGO diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 5c60887..c152459 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -13,7 +13,6 @@ #include <configs/exynos5-dt-common.h> #include <configs/exynos5-common.h>

-#undef CONFIG_LCD #undef CONFIG_EXYNOS_FB #undef CONFIG_EXYNOS_DP #undef CONFIG_KEYBOARD diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index d8d095f..502772c 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -13,7 +13,6 @@ #include <configs/exynos5-dt-common.h> #include <configs/exynos5-common.h>

-#undef CONFIG_LCD #undef CONFIG_EXYNOS_FB #undef CONFIG_EXYNOS_DP

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 6e83cc9..ed2c9ac 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -75,7 +75,6 @@ */ #ifdef CONFIG_CMD_SPI #define CONFIG_SOFT_SPI -#define CONFIG_LCD #define CONFIG_LCD_ROTATION #define CONFIG_PXA_LCD #define CONFIG_LMS283GF05 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fbf1b3c..fbfbe27 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1876,7 +1876,6 @@ CONFIG_LAYERSCAPE_NS_ACCESS CONFIG_LBA48 CONFIG_LBD CONFIG_LBDAF -CONFIG_LCD CONFIG_LCD_ALIGNMENT CONFIG_LCD_BMP_RLE8 CONFIG_LCD_DT_SIMPLEFB