From bdba2b3a8809501b7073c242f9aa013eb456790d Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Mon, 17 Oct 2016 20:12:41 -0600 Subject: [PATCH] Convert CONFIG_CFB_CONSOLE to Kconfig This converts the following to Kconfig: CONFIG_CFB_CONSOLE Signed-off-by: Simon Glass <sjg@chromium.org> --- README | 39 ------------------------- configs/eb_cpu5282_defconfig | 1 + configs/eb_cpu5282_internal_defconfig | 1 + drivers/video/Kconfig | 41 +++++++++++++++++++++++++++ include/configs/MIP405.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 1 - include/configs/P1022DS.h | 2 -- include/configs/PIP405.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/TQM5200.h | 1 - include/configs/ac14xx.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/aria.h | 1 - include/configs/aristainetos-common.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/chromebook_samus.h | 2 -- include/configs/cm_fx6.h | 1 - include/configs/colibri_imx7.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/ea20.h | 1 - include/configs/embestmx6boards.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/icon.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/ipek01.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/lwmon5.h | 1 - include/configs/m53evk.h | 1 - include/configs/mcx.h | 1 - include/configs/mpc5121ads.h | 1 - include/configs/mt_ventoux.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mx7dsabresd.h | 1 - include/configs/mxs.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/novena.h | 1 - include/configs/pdm360ng.h | 1 - include/configs/pxm2.h | 1 - include/configs/rut.h | 1 - include/configs/sequoia.h | 1 - include/configs/socrates.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tbs2910.h | 1 - include/configs/theadorable.h | 1 - include/configs/wandboard.h | 1 - scripts/config_whitelist.txt | 1 - 62 files changed, 43 insertions(+), 99 deletions(-) diff --git a/README b/README index e1ac6e39f5..b4dc217142 100644 --- 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 d022048886..03d8e43b46 100644 --- 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 7dcbe6c073..04d094ae46 100644 --- 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 64757ad7cd..5f311ea816 100644 --- 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 df3bd6ab26..ce3071c7a6 100644 --- 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 3d753adefc..50e30e2e80 100644 --- 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 332d4bc566..fdce09fc96 100644 --- 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 6ec2efa7dc..c0abd0e1de 100644 --- 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 046f2e01f7..8eff79e90d 100644 --- 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 f2ecd8382e..c4dc8da86f 100644 --- 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 e939dcb1a0..c4ff9223aa 100644 --- 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 5487004d51..85701fd717 100644 --- 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 80d893dd27..b5f171295d 100644 --- 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 5df185351a..3d221e3ddb 100644 --- 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 51ff392d2c..ca87180fe8 100644 --- 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 87e6333649..92a6d8b55f 100644 --- 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 9c466d95e8..cc8d2cdc18 100644 --- 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 b18ee911f7..bdff6db725 100644 --- 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 025e1d305d..db50a7109e 100644 --- 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 97e6fee36d..ec13b584a6 100644 --- 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 60f2bac806..0ec573262d 100644 --- 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 03cf96cfc8..1c76b5e0fc 100644 --- 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 b89ba4154a..1234bff74c 100644 --- 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 9406dfa8fe..767368c321 100644 --- 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 b883407c88..23b298db80 100644 --- 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 a952f62eeb..47a3002761 100644 --- 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 e6aa84f6c3..5e1a86be59 100644 --- 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 68f597e9e4..d3ca706070 100644 --- 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 97a912b5da..e115fd5872 100644 --- 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 d2568df845..57eec0c296 100644 --- 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 8665d7aeac..c0dadd06c0 100644 --- 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 7fc2da29e5..f858b99c3f 100644 --- 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 2ce80cd8fc..ece3d45909 100644 --- 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 cfa39172bb..447190ad06 100644 --- 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 fe68303b18..93c7864f58 100644 --- 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 a1ea57a94f..8da01ddb60 100644 --- 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 00d0c1905f..58446b559e 100644 --- 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 4c7ce52e2d..2fa56d69ce 100644 --- 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 f633e051bd..d113ec4313 100644 --- 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 3d0f66e796..ddf6c7c8a9 100644 --- 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 bb3da6f52f..3ec23584c2 100644 --- 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 f9242cd204..e02decbd1b 100644 --- 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 011eda36b0..f5ee433b1d 100644 --- 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 e658c52b76..158858fc93 100644 --- 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 dc7be114cc..fb380ba15a 100644 --- 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 66bff1eda0..e288ad8c41 100644 --- 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 e3cceeb5ff..5354f4bf02 100644 --- 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 38bcad2288..c7715a006c 100644 --- 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 634556da09..52083c8ff3 100644 --- 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 850d56009f..d18c177c11 100644 --- 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 a8ccf3cd44..334d13cfb8 100644 --- 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 7fcb2f8ff9..40194f06ee 100644 --- 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 881a93729f..efb312f101 100644 --- 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 541005ce26..ba14593f7c 100644 --- 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 e19ed75584..ca812e47bd 100644 --- 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 7392fe3399..facfdac11f 100644 --- 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 900232f556..ad32b918cb 100644 --- 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 8e10d840f3..c95efd9898 100644 --- 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 974e96dc09..db267ac280 100644 --- 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 0c18dbf29a..365019ab7c 100644 --- 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 b5e287a196..ab0ca15745 100644 --- 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 a4e6d10a2c..306e316ec5 100644 --- 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 -- 2.39.5