Convert CONFIG_CFB_CONSOLE to Kconfig

This converts the following to Kconfig:
   CONFIG_CFB_CONSOLE

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index e1ac6e39f5d157e318c602b522468303d727c918..b4dc217142407c53f5a0925c34c13e6ff3d12c16 100644 (file)
--- a/README
+++ b/README
@@ -770,49 +770,10 @@ The following options need to be configured:
                port routines must be defined elsewhere
                (i.e. serial_init(), serial_getc(), ...)
 
-               CONFIG_CFB_CONSOLE
-               Enables console device for a color framebuffer. Needs following
-               defines (cf. smiLynxEM, i8042)
-                       VIDEO_FB_LITTLE_ENDIAN  graphic memory organisation
-                                               (default big endian)
-                       VIDEO_HW_RECTFILL       graphic chip supports
-                                               rectangle fill
-                                               (cf. smiLynxEM)
-                       VIDEO_HW_BITBLT         graphic chip supports
-                                               bit-blit (cf. smiLynxEM)
-                       VIDEO_VISIBLE_COLS      visible pixel columns
-                                               (cols=pitch)
-                       VIDEO_VISIBLE_ROWS      visible pixel rows
-                       VIDEO_PIXEL_SIZE        bytes per pixel
-                       VIDEO_DATA_FORMAT       graphic data format
-                                               (0-5, cf. cfb_console.c)
-                       VIDEO_FB_ADRS           framebuffer address
-                       VIDEO_KBD_INIT_FCT      keyboard int fct
-                                               (i.e. rx51_kp_init())
-                       VIDEO_TSTC_FCT          test char fct
-                                               (i.e. rx51_kp_tstc)
-                       VIDEO_GETC_FCT          get char fct
-                                               (i.e. rx51_kp_getc)
-                       CONFIG_VIDEO_LOGO       display Linux logo in
-                                               upper left corner
-                       CONFIG_VIDEO_BMP_LOGO   use bmp_logo.h instead of
-                                               linux_logo.h for logo.
-                                               Requires CONFIG_VIDEO_LOGO
-                       CONFIG_CONSOLE_EXTRA_INFO
-                                               additional board info beside
-                                               the logo
-                       CONFIG_HIDE_LOGO_VERSION
-                                               do not display bootloader
-                                               version string
-
                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).
 
-               When CONFIG_CFB_CONSOLE is defined, video console is
-               default i/o. Serial console can be forced with
-               environment 'console=serial'.
-
                CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default
                        is 0x00.
                CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default

diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index d0220488861bcf3a911d257f0c46ecfb44b0ebf0..03d8e43b4681fbb0521e9a2c267add3f03ff8fd7 100644 (file)
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -12,3 +12,4 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
+# CONFIG_CFB_CONSOLE is not set

diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 7dcbe6c07308cf56a8e1622066422b34338c63a7..04d094ae4677f4518674c1e18c9e086c8d2d13f9 100644 (file)
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -11,3 +11,4 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
+# CONFIG_CFB_CONSOLE is not set

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 64757ad7cd6410251a08b15b9d7d367f3cd8e0aa..5f311ea816b50c9447d0382ac22cbff12450a77a 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -443,6 +443,47 @@ config VIDEO
          model. Video drivers typically provide a colour text console and
          cursor.
 
+config CFB_CONSOLE
+       bool "Enable colour frame buffer console"
+       depends on VIDEO
+       default y if VIDEO
+       help
+         Enables the colour frame buffer driver. This supports colour
+         output on a bitmap display from an in-memory frame buffer.
+         Several colour devices are supported along with various options to
+         adjust the supported features. The driver is implemented in
+         cfb_console.c
+
+         The following defines are needed (cf. smiLynxEM, i8042)
+               VIDEO_FB_LITTLE_ENDIAN  graphic memory organisation
+                                       (default big endian)
+               VIDEO_HW_RECTFILL       graphic chip supports
+                                       rectangle fill (cf. smiLynxEM)
+               VIDEO_HW_BITBLT         graphic chip supports
+                                       bit-blit (cf. smiLynxEM)
+               VIDEO_VISIBLE_COLS      visible pixel columns (cols=pitch)
+               VIDEO_VISIBLE_ROWS      visible pixel rows
+               VIDEO_PIXEL_SIZE        bytes per pixel
+               VIDEO_DATA_FORMAT       graphic data format
+                                       (0-5, cf. cfb_console.c)
+               VIDEO_FB_ADRS           framebuffer address
+               VIDEO_KBD_INIT_FCT      keyboard int fct (i.e. rx51_kp_init())
+               VIDEO_TSTC_FCT          test char fct (i.e. rx51_kp_tstc)
+               VIDEO_GETC_FCT          get char fct (i.e. rx51_kp_getc)
+               CONFIG_VIDEO_LOGO       display Linux logo in upper left corner
+               CONFIG_VIDEO_BMP_LOGO   use bmp_logo.h instead of linux_logo.h
+                                       for logo. Requires CONFIG_VIDEO_LOGO
+               CONFIG_CONSOLE_EXTRA_INFO
+                                       additional board info beside
+                                       the logo
+               CONFIG_HIDE_LOGO_VERSION
+                                       do not display bootloader
+                                       version string
+
+         When CONFIG_CFB_CONSOLE is defined, the video console is the
+         default console. The serial console can be forced by setting the
+         environment 'console=serial'.
+
 config LCD
        bool "Enable legacy LCD support"
        help

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index df3bd6ab2609bb2556443b47d324b74382f8c2fb..ce3071c7a6832946325123804013d9dcc7b916a3 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -340,7 +340,6 @@
  * Video support
  ************************************************************/
 #define CONFIG_VIDEO_CT69000
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_VGA_AS_SINGLE_DEVICE

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 3d753adefc9cbff1f8fcbbc2c5628bc25486d2fa..50e30e2e80fc0ac26f45d97f2d88c3fdebffc3bb 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -506,7 +506,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 332d4bc566a3a43b7d9812c270ea344727ba226d..fdce09fc96a6481bacd84e9e441cf675860abea1 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -278,7 +278,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 6ec2efa7dc44103fee27140bf179861c5d642621..c0abd0e1de54559489af4e0f80f99d41693d45ef 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -465,7 +465,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 046f2e01f7ad9c2f8b8b0a277c17dfb07e4eb648..8eff79e90dcea0adba1da1d352665966bb82b2a0 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -24,7 +24,6 @@
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x2c000)
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index f2ecd8382e6e006f8c7619e03da15374936863d9..c4dc8da86f4c3cb6a6f57f0a55ef2bde1c223f84 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -378,7 +378,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index e939dcb1a0249544d96176b836dd66741af84ca0..c4ff9223aa64e40cfd5cd9d4644e92782fb85678 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -379,7 +379,6 @@
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x10000)
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
@@ -402,7 +401,6 @@
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif
 

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 5487004d51cc043d6e581ccd3a2f521e6dc3cae7..85701fd717282a9affb8bdf5ed97b8b28301e61b 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -300,7 +300,6 @@
  * Video support
  ************************************************************/
 #define CONFIG_VIDEO_CT69000
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_VGA_AS_SINGLE_DEVICE

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 80d893dd2740fff0e8433e1c26135df2a84b3181..b5f171295db146612b670a874e087893c7992d36 100644 (file)
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -503,7 +503,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 5df185351a8f96a404e983426de843e356246e64..3d221e3ddb9937edb4e878067886070dee450b09 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -509,7 +509,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 51ff392d2cf8146310f2eb5068a4799021770b49..ca87180fe8c351e98398100a31ab1d0bbd25538a 100644 (file)
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -413,7 +413,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 87e63336491a11dabdfdcb99443795b01d8313fe..92a6d8b55f2a64225b869cdf78a51c97c69ef378 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
 #define CONFIG_CFB_CONSOLE_ANSI
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 9c466d95e861188349a87c6c5340e0d454efd6c9..cc8d2cdc188358b5f7e25c8c78a535fe6ca1416f 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -99,7 +99,6 @@
 #ifndef CONFIG_TQM5200S                /* No graphics controller on TQM5200S */
 #define CONFIG_VIDEO_SM501
 #define CONFIG_VIDEO_SM501_32BPP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 
 #ifndef CONFIG_FO300

diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index b18ee911f71a112470acd04a7c1fbffc793bde53..bdff6db7250253c18fd887d792bba35095e3ebf9 100644 (file)
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -32,7 +32,6 @@
 #define CONFIG_SYS_TEXT_BASE   0xFFF00000
 
 #if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif
 

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 025e1d305d3290ffc0cb2ff6083a0f217b638c4f..db50a7109eeeb9d3dff256adb17ecafe157b1329 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -273,7 +273,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/aria.h b/include/configs/aria.h
index 97e6fee36db893be4b172ca452af93f0ef38d163..ec13b584a6a1fa0c266c98bd761e0f9e59c122b3 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -39,7 +39,6 @@
 /* video */
 
 #if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif
 

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 60f2bac806262729219ca396d40be974ad7ad765..0ec573262d6a0e37a1834e1cb0ae860dbb523687 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -231,7 +231,6 @@
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 /* check this console not needed, after test remove it */
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 03cf96cfc8e8d908b9406dfa5f26c4763c7331d6..1c76b5e0fcb425f4866287d928fb0b5f3a9baf44 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -89,7 +89,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/chromebook_samus.h b/include/configs/chromebook_samus.h
index b89ba4154a381da530aaf28a2d00dd1f595e94d0..1234bff74c20e6b788b52e083fd547d6af8531d4 100644 (file)
--- a/include/configs/chromebook_samus.h
+++ b/include/configs/chromebook_samus.h
@@ -16,8 +16,6 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#undef CONFIG_CFB_CONSOLE
-
 #undef CONFIG_STD_DEVICES_SETTINGS
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
                                        "stdout=vidconsole,serial\0" \

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 9406dfa8fe5f40d1abae5d0095c75ffda5271d13..767368c321ae64f64fe7f220097625acb82446c8 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -255,7 +255,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_IMX_HDMI
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index b883407c8808046a7b48f2d03b9befe70e9ae703..23b298db806ce8fde8ce0e9ccd15105a2ca510e7 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -222,7 +222,6 @@
 #define DFU_DEFAULT_POLL_TIMEOUT       300
 
 #ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index a952f62eeb5790ecb24e3e43e77139de8faac792..47a3002761c10e711cd7cc01fdd925785eb4a8d8 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -225,7 +225,6 @@
  */
 #define CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x10000)
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
 

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index e6aa84f6c3f7d832d70b78a0db1bea5daaac8547..5e1a86be59a8c15f893a3987332a673bf64b334a 100644 (file)
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -77,7 +77,6 @@
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
 #define CONFIG_VIDEO_CORALP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_VIDEO_SW_CURSOR

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 68f597e9e4cbe71bb933d818e3f076a547806927..d3ca706070ccce8d6361bf9f05117ff12608aeca 100644 (file)
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -102,7 +102,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 97a912b5daf1f187db5288c3dc587a0fb9fa563a..e115fd5872bff23eb03c6e438ae479208b94d8f3 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -118,7 +118,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index d2568df8450fd19639b702c1021bfa624a0bca00..57eec0c29600dccdaa2546f152743a42ff5a17f5 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -309,7 +309,6 @@
 /* Framebuffer */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 8665d7aeac917473c76d5b332b90367b8542931a..c0dadd06c0383695b1db20c28e9b175dcd8c412d 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -179,7 +179,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IPUV3_CLK          260000000

diff --git a/include/configs/icon.h b/include/configs/icon.h
index 7fc2da29e508fb27d5f6ef2ec3903aaa782b1f0d..f858b99c3f1e66fda125600551c84d6b9a78fa35 100644 (file)
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -132,7 +132,6 @@
 #define CONFIG_VIDEO_SM501_32BPP
 #define CONFIG_VIDEO_SM501_PCI
 #define VIDEO_FB_LITTLE_ENDIAN
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_VGA_AS_SINGLE_DEVICE

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 2ce80cd8fc80357d022e0a69afc8f91ef6c332ae..ece3d459099e6a5a8a6d7360d7178d714f14837a 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -178,7 +178,6 @@
 
 #define CONFIG_S6E63D6
 
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MX3
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR

diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index cfa39172bbbccf3e819e1d1f7c56031ee24b7553..447190ad0689e5cf014d5feca853d073ab93860d 100644 (file)
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -47,7 +47,6 @@
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index fe68303b18414f7924f96556f21a1a93e3c7836a..93c7864f584223b27248f3d4eb904cf39cdfd844 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -445,7 +445,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_FSL_DCU_FB
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index a1ea57a94fcedf970b6f5c00dc0f983625780a7b..8da01ddb60b66e00eeaf04025f5540f7aa5fd3a0 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -327,7 +327,6 @@
 
 #ifdef CONFIG_FSL_DCU_FB
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 00d0c1905fc972616ffd6de3262a70f6563f7807..58446b559e59a287e6842820cee5d2f4fca6ef6c 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -355,7 +355,6 @@
 /* Video console */
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 4c7ce52e2dcd19d7bc7c9776d5c62e837befff8a..2fa56d69cee5ed1447ca4df162edca50201ae50f 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -199,7 +199,6 @@
  */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_GZIP

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index f633e051bda861beb8a7cdfbb4300df88e242c76..d113ec43133627145ccbf0213850caa612842ee6 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -365,7 +365,6 @@
 #define CONFIG_NET_RETRY_COUNT 10
 #endif
 
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 3d0f66e796e7beb6bd420d47c679914d3ae04a2c..ddf6c7c8a9175695020881ee95dbf9f2a516b268 100644 (file)
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -37,7 +37,6 @@
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_IMMR + 0x2100)
 #define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index bb3da6f52f941dd40e38e49e68d7b84c4a15445f..3ec23584c2db54bdae0231cf4bb4cc6ba5036f51 100644 (file)
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -51,7 +51,6 @@
 #define CONFIG_FPGA_DELAY() udelay(1)
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index f9242cd2043d242c4bdb1b30cc55a4aff9aeedcc..e02decbd1b48d4b9520343a173c698663790b4d6 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -94,7 +94,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 011eda36b07b948cd676b9c364b996024e1aaaf6..f5ee433b1dd1936d783c98b5af5c1f9983a10088 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -214,7 +214,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index e658c52b76dd2beb0a48a1648f5bddd5b46a3cf9..158858fc933e8e4bcb29769e66f31c53bb9dbf3b 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -35,7 +35,6 @@
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK               260000000
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index dc7be114cc1572f43ae2f393c7d5e138d7f2476c..fb380ba15a633cff904fadb220977693ba7edd6b 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -209,7 +209,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 66bff1eda0dafd47b2abb62de0b26e2c2eca7e72..e288ad8c4152f2fff21fb374bc2011489c53fd7f 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -206,7 +206,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index e3cceeb5ff7f90f5c7b407d102fa522831111546..5354f4bf020e2ac12f03d4e41e2d1fa9511bf33d 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -226,7 +226,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 38bcad2288bbd13adf7e6903ee8443f13e547750..c7715a006cdc32bdc7fbb042c2488c2ad19efed0 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -251,7 +251,6 @@
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 #ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 634556da096c66a3f2070ff6022a104615e2e6b6..52083c8ff351c39678d998a8fe4e716289442a21 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -143,7 +143,6 @@
 
 /* LCD */
 #ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 850d56009fefe02331a2bf3e3b4b18ff0617d8e7..d18c177c1183a4ad3de1e29247bd59a2cabe9ce2 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -93,7 +93,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a8ccf3cd44e9584c91f070f7f7a13ab13f15f37e..334d13cfb87402dab3be35f0f99592c860b93130 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
 #define CONFIG_CFB_CONSOLE_ANSI        /* Enable ANSI escape codes in framebuffer */
 #define CONFIG_VIDEO_LOGO
 #define VIDEO_FB_16BPP_PIXEL_SWAP

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 7fcb2f8ff9da2361b501dd2940a6a2f2f6d9caa9..40194f06ee22ef0df4150536f51a5e2716b098ae 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -161,7 +161,6 @@
 /* Video output */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index 881a93729f582a3f4444ae841253367eee274362..efb312f101e9607109f24b0af9162e31c67ac1cf 100644 (file)
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -40,7 +40,6 @@
 /* Video */
 
 #if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 541005ce2669044972d1b833c9d08280cba20919..ba14593f7c05585e62b5b673790415c33e5bf119 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -126,7 +126,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/rut.h b/include/configs/rut.h
index e19ed755840bd2d7199761306415dc8952650051..ca812e47bdb195dca5af21fda435609eaf69a5ef 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -120,7 +120,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 7392fe33991d9562d15949d617473ab927c19cae..facfdac11f10e76d3e6881ddd547cd45fc7b03a5 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -410,7 +410,6 @@
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS         VIDEO_IO_OFFSET
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 900232f556b612d0880032a26f8240ba182b7ebf..ad32b918cb24acc285ba4bf83a7747d91a9d3782 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -170,7 +170,6 @@
 
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 8e10d840f3639f1aea7d6ebbc6717ba3465b4873..c95efd9898fb34d455ec43a84c6acd6034244aea 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -288,7 +288,6 @@ extern int soft_i2c_gpio_scl;
 
 #define CONFIG_VIDEO_SUNXI
 
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_STD_TIMINGS

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 974e96dc09e1e7bb4a47fe6a55df005c2e259513..db267ac280e88fdd8351954e8f34f00b8fd65604 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
 #define CONFIG_CFB_CONSOLE_ANSI
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 0c18dbf29af33be20a88904af2278f5ad49f1226..365019ab7c7dbc46a879310f66d2b2e1529d2e10 100644 (file)
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -96,7 +96,6 @@
 /* Enable LCD and reserve 512KB from top of memory*/
 #define CONFIG_SYS_MEM_TOP_HIDE                0x80000
 
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
 

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index b5e287a1965da388d68630c53ca90381bf0bc0f7..ab0ca15745b69eb2f26a5f20fb46b169698d6271 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -75,7 +75,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a4e6d10a2c620b1eaa69da159a3fe5a4e72d75cb..306e316ec528ac546d648118b842d00ced510f05 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
 CONFIG_CFB_CONSOLE_ANSI
 CONFIG_CFG_DATA_SECTOR
 CONFIG_CFG_FAT