Convert CONFIG_CFB_CONSOLE_ANSI to Kconfig

This converts the following to Kconfig:
   CONFIG_CFB_CONSOLE_ANSI

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

diff --git a/README b/README
index b4dc217142407c53f5a0925c34c13e6ff3d12c16..59965980ec6f9a22d6e2f92cde63164630268501 100644 (file)
--- a/README
+++ b/README
@@ -770,10 +770,6 @@ The following options need to be configured:
                port routines must be defined elsewhere
                (i.e. serial_init(), serial_getc(), ...)
 
-               When CONFIG_CFB_CONSOLE_ANSI is defined, console will support
-               a limited number of ANSI escape sequences (cursor control,
-               erase functions and limited graphics rendition control).
-
                CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default
                        is 0x00.
                CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default

diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index 14919fb84a91011e6055eb67e8b7817da8ad9455..44303c7c0105d6c43efed6abbbf9388438d2fbba 100644 (file)
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -39,4 +39,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index 62c08bad68ebc2b76278556eeaf6c722e105892c..c14b641fc61dc6867364091dee5c68939c360bd8 100644 (file)
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -39,4 +39,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
index 25c4ad6372c0e510f401ecf33e611196feb99c03..f531001cd51aa5673c3a01182bba1a1d58099d9e 100644 (file)
--- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
@@ -32,6 +32,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index 63975b7e38869d77d94bb6c18d1e78ca00108715..31527b3a12e06876671630efadec07fb09651896 100644 (file)
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -40,4 +40,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index 61d5dd5400f7e518d77437e6aaf3203bec2c338b..d503070136cfb4552411932015ca17c967d0649b 100644 (file)
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -30,4 +30,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
index a32abfe545f0e107815cc635d799d6fe27de204f..7e78aa2a1e44f9722e78eb37ed1e9dfeb6d0a312 100644 (file)
--- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
@@ -43,6 +43,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index 7026cf3c10e3112d8e0296d17f07d71b12e79f59..ae40fe6a3f172fd1b978aa6ba89ac622bc2e743b 100644 (file)
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -39,4 +39,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index c7fec10ae8e707fa05fa347483fa220441ba2977..3c31b367ff9b495c1c0352f767cb5c8368589e8e 100644 (file)
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -39,4 +39,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index 4d9509c5fc7934dcdc57595b6c05071c68bab1f4..12068a6690547d685f4d7fcddf163b83e35c905d 100644 (file)
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -40,4 +40,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 55f95227f29e8a655ba2b168dc836f2c3ac807bc..85b3cbf24e5e28c57a6053a85777f9cae642baf1 100644 (file)
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -30,4 +30,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index d4591c9d957be0e98b16a0d0c84a78e0530f0acb..65c5d6874084fbcd464e0e5ed7f15eae2d0e69ee 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -23,3 +23,4 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
+CONFIG_CFB_CONSOLE_ANSI=y

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 07c161e6ecbb5ea1ef56f8a73675ef8cad942aa3..87dce3665c9af3805c4ef77b62eb0ebaf0e5a7e2 100644 (file)
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -37,4 +37,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="TBS"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 5f311ea816b50c9447d0382ac22cbff12450a77a..d3e0a1a9a03928fc206518afc7dbec35f07a3daf 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -484,6 +484,15 @@ config CFB_CONSOLE
          default console. The serial console can be forced by setting the
          environment 'console=serial'.
 
+config CFB_CONSOLE_ANSI
+       bool "Support ANSI escape sequences"
+       depends on CFB_CONSOLE
+       help
+         This allows the colour buffer frame buffer driver to support
+         a limited number of ANSI escape sequences (cursor control,
+         erase functions and limited graphics rendition control). Normal
+         output from U-Boot will pass through this filter.
+
 config LCD
        bool "Enable legacy LCD support"
        help

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 92a6d8b55f2a64225b869cdf78a51c97c69ef378..50ca2d759d83a60ae62f70e54e4d9bc18c39bd55 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -525,7 +525,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE_ANSI
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 334d13cfb87402dab3be35f0f99592c860b93130..45c46a0bade3e8d2e2f28872daae48249b4f05cc 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -224,7 +224,6 @@
  * Framebuffer
  */
 /* Video console */
-#define CONFIG_CFB_CONSOLE_ANSI        /* Enable ANSI escape codes in framebuffer */
 #define CONFIG_VIDEO_LOGO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index db267ac280e88fdd8351954e8f34f00b8fd65604..f77e88e4c32e2224d0b7a5bf3225dd690a5d5631 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -76,7 +76,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK               260000000
-#define CONFIG_CFB_CONSOLE_ANSI
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 306e316ec528ac546d648118b842d00ced510f05..dbc8ca8ffa4675d6c5fc121544587c3226d7b219 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -492,7 +492,6 @@ CONFIG_CDP_PORT_ID
 CONFIG_CDP_POWER_CONSUMPTION
 CONFIG_CDP_TRIGGER
 CONFIG_CDP_VERSION
-CONFIG_CFB_CONSOLE_ANSI
 CONFIG_CFG_DATA_SECTOR
 CONFIG_CFG_FAT
 CONFIG_CFG_USB