diff options
| author | Simon Glass <sjg@chromium.org> | 2016-10-17 20:12:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-23 18:33:22 -0400 |
| commit | f8b19a889e0d9d21af4be6b0fd6363a5b5a546f7 (patch) | |
| tree | 405fb38949de36ace5be0ddd96f474603c46f592 | |
| parent | 27604b158fb2a85ae96e949822870bb6add10c46 (diff) | |
| download | u-boot-f8b19a889e0d9d21af4be6b0fd6363a5b5a546f7.tar.gz | |
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>
Reviewed-by: Jagan Teki <jteki@openedev.com>
77 files changed, 61 insertions, 29 deletions
diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig index 38f511967c..9bc8c73142 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 e5458480d0..9649012a10 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 b2a46cb541..a1573fd9c8 100644 --- a/configs/at91sam9261ek_dataflash_cs0_defconfig +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig @@ -18,4 +18,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 a16e7e1961..63304f56ef 100644 --- a/configs/at91sam9261ek_dataflash_cs3_defconfig +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig @@ -18,4 +18,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 17d0fdd244..229da6d954 100644 --- a/configs/at91sam9261ek_nandflash_defconfig +++ b/configs/at91sam9261ek_nandflash_defconfig @@ -18,4 +18,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 5b366883c6..15afd250a8 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -21,4 +21,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 5b366883c6..15afd250a8 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -21,4 +21,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 024d75072c..61f217a4c6 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -21,4 +21,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 297e4e741e..4cf3df90f8 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -21,4 +21,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 237bdee44e..7e0e039bf2 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -21,4 +21,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 f00f61baa8..703db6be91 100644 --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig @@ -18,4 +18,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 dc413b27f7..a4c53da9fe 100644 --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig @@ -18,4 +18,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 325e0ee80d..731fd69183 100644 --- a/configs/at91sam9g10ek_nandflash_defconfig +++ b/configs/at91sam9g10ek_nandflash_defconfig @@ -18,4 +18,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 de374cf246..783ea262d3 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -29,4 +29,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 70cb74f6b3..3183537a87 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -27,4 +27,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 b2b53b9424..e70afb7ff5 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -21,4 +21,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 f2c0f3c499..85aa011ed5 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -27,4 +27,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 62b01d66cc..a1bd73711e 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_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/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index 5d92c5ff9b..c67a981dd9 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -18,4 +18,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 d7214f2988..69cd1d9d57 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -18,4 +18,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 205e44d691..9f46d9ba62 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -18,4 +18,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 441a9408b4..7c135cb49b 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -23,4 +23,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 9962d1f07c..3628327f74 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -23,4 +23,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 8fb4af7713..66a5fb0ab4 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_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/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 2125635c7d..2f94f5932a 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_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/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index 8d3ef0eb0d..498091eb2a 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -46,4 +46,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 f62419717d..e343409894 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -46,4 +46,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 474477ad9a..275c8ab8fc 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -54,4 +54,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 49c26e29a3..36d980cc0e 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -45,5 +45,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 dfc25390c2..a23a4f5d31 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -22,4 +22,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 79fa39c8cc..f45623accb 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -23,4 +23,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 e5f34a1626..df160aea40 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 ddcb451214..abc23c4e99 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 3e69f421a7..5ed8f3bb4a 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_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/pm9261_defconfig b/configs/pm9261_defconfig index f9a59a6020..f9e53c7f9c 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_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/pm9263_defconfig b/configs/pm9263_defconfig index f9f56d278f..774b7e5c73 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -16,3 +16,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 591fa35683..b09651ada6 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -22,5 +22,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 851deaa00f..2e7c634bba 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_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_3_defconfig b/configs/rpi_3_defconfig index 66fcc1bebd..0b0379f13f 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -23,5 +23,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 d912945d48..ba64c7c915 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -22,5 +22,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 9573effc4d..e44795595e 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_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/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 73f13bd23b..863917f2b3 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -29,4 +29,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 bff891ebf1..d1128f26ec 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_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/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index a3ffdd31da..b79c23a40d 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_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/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index d49645e11f..36e0aca62b 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_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/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index db243af552..fa35450e8e 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_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/snow_defconfig b/configs/snow_defconfig index a5754f809a..c5d8d3977f 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 0c394c8548..8aab1750a7 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 336d8e42bf..3e4f3864b7 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 d9819a570d..58992159e7 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 866fafd7eb..64757ad7cd 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -443,4 +443,12 @@ config VIDEO model. Video drivers typically provide a colour text console and cursor. +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 898ed7d926..6230948c44 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 5496a9f693..f96a6967f4 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 98a0588bc6..d8ff00c7de 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 6874608c40..af1262df13 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 403a2078d6..a1ca0077b4 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 c55c9656ca..fbf091e119 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 04c41cc482..62b9b68d87 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 ccc5bb4b37..0e138648d5 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 1e8426fdb5..b9f69be27d 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 07f0c411e4..f15fc4b7ab 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -281,7 +281,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 3f8c7bef51..b6ba532749 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -282,7 +282,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 3d81f9457d..7cb3a296b5 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 b156e42a2a..3591e7f4c7 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 b01fe4c51d..296d77ac78 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 76c739776a..f4caa6f720 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 6ac42b8629..867a9dd9bb 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 f112c36f36..7941bd15e0 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 8d4ad5d608..62950369e3 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 e684d2a77d..fb42021731 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 8b73a1b03a..6ef52737f7 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 c90e1e6f8a..bc23a8c4a3 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 b9927e9d25..f75ceee671 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 5c60887563..c152459c44 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 d8d095ff4d..502772c949 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 6e83cc9180..ed2c9acdb1 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 64f21f1b70..b41e2d94c4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1883,7 +1883,6 @@ CONFIG_LAYERSCAPE_NS_ACCESS CONFIG_LBA48 CONFIG_LBD CONFIG_LBDAF -CONFIG_LCD CONFIG_LCD_ALIGNMENT CONFIG_LCD_BMP_RLE8 CONFIG_LCD_DT_SIMPLEFB |