Kconfig: Move console options to Kconfig

PATCH Superseded Simon Glass 4 participants 66 messages Sep 29, 2016 – Oct 13, 2016 Page 2 of 2

Subsystems (13)

Network drivers USB Arm i.MX and Layerscape Framebuffer layer +9 more subsystems

lore

Share & tools

lore

Simon Glass

author

2016-09-29 20:23 UTC #19 lore raw

PATCH v3 8/29 Convert CONFIG_CFB_CONSOLE to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_CFB_CONSOLE

Signed-off-by Simon Glass <[email protected]>

---

Changes in v3:
- Change CONFIG_CFB_CONSOLE to default y if CONFIG_VIDEO

Changes in v2: None

 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/cougarcanyon2.h       |  1 -
 include/configs/digsy_mtc.h           |  1 -
 include/configs/ea20.h                |  1 -
 include/configs/efi-x86.h             |  1 -
 include/configs/embestmx6boards.h     |  1 -
 include/configs/galileo.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 -
 include/configs/x86-common.h          |  1 -
 scripts/config_whitelist.txt          |  1 -
 66 files changed, 43 insertions(+), 103 deletions(-)

README +0 ~~-39~~

index c222663..18c5455 100644
@@ -810,49 +810,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

configs/eb_cpu5282_defconfig +1 -0

index daaa345..537d469 100644
@@ -10,3 +10,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

configs/eb_cpu5282_internal_defconfig +1 -0

index 90e0094..e5f41f9 100644
@@ -9,3 +9,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

drivers/video/Kconfig +41 -0

45 lines not on this page · raw message

include/configs/MIP405.h +0 -1

index e9101a0..e9f0369 100644
@@ -343,7 +343,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

include/configs/MPC8536DS.h +0 -1

index 5b638d9..e4fec53 100644
@@ -507,7 +507,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

include/configs/MPC8544DS.h +0 -1

index 11ba6dd..23e8de4 100644
@@ -280,7 +280,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

include/configs/MPC8572DS.h +0 -1

index 26849fc..1571c8a 100644
@@ -467,7 +467,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

include/configs/MPC8610HPCD.h +0 -1

index 35fc2c9..699293c 100644
@@ -26,7 +26,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

include/configs/MPC8641HPCN.h +0 -1

index fa5b180..ce4e33f 100644
@@ -380,7 +380,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

include/configs/P1022DS.h +0 -2

index f7f1c4d..c4e3e65 100644
@@ -381,7 +381,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

@@ -404,7 +403,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

include/configs/PIP405.h +0 -1

index 8649cdb..6110f28 100644
@@ -303,7 +303,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

include/configs/T102xQDS.h +0 -1

index 50e4046..d8a53bc 100644
@@ -502,7 +502,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

include/configs/T102xRDB.h +0 -1

index 5760db9..d8792d6 100644
@@ -500,7 +500,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

include/configs/T1040QDS.h +0 -1

index 4f320ce..af63dd3 100644
@@ -414,7 +414,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

include/configs/T104xRDB.h +0 -1

index 31b10ee..6480e4e 100644
@@ -484,7 +484,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_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

include/configs/TQM5200.h +0 -1

index ed2fccf..9ecc363 100644
@@ -100,7 +100,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

include/configs/ac14xx.h +0 -1

index 699ac41..f1013c4 100644
@@ -33,7 +33,6 @@
 #define CONFIG_SYS_TEXT_BASE	0xFFF00000
 
 #if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif

include/configs/advantech_dms-ba16.h +0 -1

index b771242..840e3d9 100644
@@ -276,7 +276,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

include/configs/aria.h +0 -1

index f91e183..7b7e6e2 100644
@@ -40,7 +40,6 @@
 /* video */
 
 #if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif

include/configs/aristainetos-common.h +0 -1

index 60f2bac..0ec5732 100644
@@ -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

include/configs/cgtqmx6eval.h +0 -1

index 03cf96c..1c76b5e 100644
@@ -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

include/configs/chromebook_samus.h +0 -2

index b89ba41..1234bff 100644
@@ -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" \

include/configs/cm_fx6.h +0 -1

index a1f11cb..55a5f93 100644
@@ -256,7 +256,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

include/configs/colibri_imx7.h +0 -1

index ae0fe6e..d523af8 100644
@@ -224,7 +224,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

include/configs/controlcenterd.h +0 -1

index a952f62..47a3002 100644
@@ -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

include/configs/cougarcanyon2.h +0 -1

index ab87aa8..2ae42b7 100644
@@ -28,6 +28,5 @@
 #define CONFIG_ENV_OFFSET		0x5ff000
 
 /* Video is not supported for now */
-#undef CONFIG_CFB_CONSOLE
 
 #endif	/* __CONFIG_H */

include/configs/digsy_mtc.h +0 -1

index 0a960ad..b90554f 100644
@@ -78,7 +78,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

include/configs/ea20.h +0 -1

index 68f597e..d3ca706 100644
@@ -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

include/configs/efi-x86.h +0 -1

index 7812870..5626061 100644
@@ -15,7 +15,6 @@
 
 #undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_NOWHERE
-#undef CONFIG_CFB_CONSOLE
 #undef CONFIG_SCSI_AHCI
 #undef CONFIG_SCSI
 #undef CONFIG_INTEL_ICH6_GPIO

include/configs/embestmx6boards.h +0 -1

index 97a912b..e115fd5 100644
@@ -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

include/configs/galileo.h +0 -1

index f4aceb9..beea0d8 100644
@@ -32,7 +32,6 @@
 #undef CONFIG_SCSI
 
 /* Video is not supported in Quark SoC */
-#undef CONFIG_CFB_CONSOLE
 
 /* SD/MMC support */
 #define CONFIG_MMC

include/configs/ge_bx50v3.h +0 -1

index cf805b3..3baac67 100644
@@ -307,7 +307,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

include/configs/gw_ventana.h +0 -1

index a23f4c4..fa3a7286 100644
@@ -181,7 +181,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

include/configs/icon.h +0 -1

index 7fc2da2..f858b99 100644
@@ -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

include/configs/imx31_phycore.h +0 -1

index f39dd31..5a20437 100644
@@ -181,7 +181,6 @@
 
 #define CONFIG_S6E63D6
 
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MX3
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR

include/configs/ipek01.h +0 -1

index 42019a2..99200d1 100644
@@ -48,7 +48,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

include/configs/ls1021aqds.h +0 -1

index 141ecf2..a19f206 100644
@@ -451,7 +451,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

include/configs/ls1021atwr.h +0 -1

index e20b645..3c596f3 100644
@@ -332,7 +332,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

include/configs/lwmon5.h +0 -1

index 00d0c19..58446b5 100644
@@ -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

include/configs/m53evk.h +0 -1

index e183ee8..3913fcd 100644
@@ -201,7 +201,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

include/configs/mcx.h +0 -1

index 480d3b5..25ab0c9 100644
@@ -371,7 +371,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

include/configs/mpc5121ads.h +0 -1

index 719335a..ac3ac35 100644
@@ -38,7 +38,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

include/configs/mt_ventoux.h +0 -1

index bb3da6f..3ec2358 100644
@@ -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

include/configs/mx51evk.h +0 -1

index 788740a..4ecd7fd 100644
@@ -97,7 +97,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

include/configs/mx53loco.h +0 -1

index a4c08f3..89e5557 100644
@@ -216,7 +216,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

include/configs/mx6cuboxi.h +0 -1

index e658c52..158858f 100644
@@ -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

include/configs/mx6sabre_common.h +0 -1

index dc7be11..fb380ba 100644
@@ -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

include/configs/mx6sxsabresd.h +0 -1

index 66bff1e..e288ad8 100644
@@ -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

include/configs/mx6ul_14x14_evk.h +0 -1

index 993be1a..c9ca034 100644
@@ -229,7 +229,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

include/configs/mx7dsabresd.h +0 -1

index a7bf7f5..da75d03 100644
@@ -253,7 +253,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

include/configs/mxs.h +0 -1

index 634556d..52083c8 100644
@@ -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

include/configs/nitrogen6x.h +0 -1

index 850d560..d18c177 100644
@@ -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

include/configs/nokia_rx51.h +0 -1

index 688265e..462bbe2 100644
@@ -230,7 +230,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

include/configs/novena.h +0 -1

index 7fcb2f8..40194f0 100644
@@ -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

include/configs/pdm360ng.h +0 -1

index af4baa8..acadf72 100644
@@ -41,7 +41,6 @@
 /* Video */
 
 #if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_LOGO

include/configs/pxm2.h +0 -1

index 541005c..ba14593 100644
@@ -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

include/configs/rut.h +0 -1

index e19ed75..ca812e4 100644
@@ -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

include/configs/sequoia.h +0 -1

index 7392fe3..facfdac 100644
@@ -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

include/configs/socrates.h +0 -1

index 18c496f..5abdd23 100644
@@ -171,7 +171,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

include/configs/sunxi-common.h +0 -1

index e7cf038..78333c6 100644
@@ -290,7 +290,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

include/configs/tbs2910.h +0 -1

index 6b1094b..6ec1cc5 100644
@@ -74,7 +74,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

include/configs/theadorable.h +0 -1

index 0c18dbf..365019a 100644
@@ -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

include/configs/wandboard.h +0 -1

index 052742c..aacf4ef 100644
@@ -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

include/configs/x86-common.h +0 -1

index 7547c90..7633a43 100644
@@ -132,7 +132,6 @@
 #define CONFIG_VIDEO_SW_CURSOR
 #define VIDEO_FB_16BPP_WORD_SWAP
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_CONSOLE_SCROLL_LINES 5
 
 /*-----------------------------------------------------------------------

scripts/config_whitelist.txt +0 -1

index 56a8354..b6c1046 100644
@@ -493,7 +493,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

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 04:48 UTC #20 lore raw

PATCH v3 8/29 Convert CONFIG_CFB_CONSOLE to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 10 lines

This converts the following to Kconfig:
CONFIG_CFB_CONSOLE
Signed-off-by Simon Glass <[email protected]>
---
Changes in v3:
- Change CONFIG_CFB_CONSOLE to default y if CONFIG_VIDEO
Changes in v2: None

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Tom Rini

2016-10-01 02:38 UTC #21 lore raw

PATCH v3 8/29 Convert CONFIG_CFB_CONSOLE to Kconfig

In reply to Simon Glass

Quoted 4 lines · Simon Glass

This converts the following to Kconfig:
CONFIG_CFB_CONSOLE
Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160930/d5c2bcc2/attachment.sig>

Simon Glass

author

2016-09-29 20:23 UTC #22 lore raw

PATCH v3 9/29 Convert CONFIG_CFB_CONSOLE_ANSI to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_CFB_CONSOLE_ANSI

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                                         | 4 ----
 configs/T1042D4RDB_NAND_defconfig              | 1 +
 configs/T1042D4RDB_SDCARD_defconfig            | 1 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig       | 1 +
 configs/T1042D4RDB_SPIFLASH_defconfig          | 1 +
 configs/T1042D4RDB_defconfig                   | 1 +
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 1 +
 configs/T1042RDB_PI_NAND_defconfig             | 1 +
 configs/T1042RDB_PI_SDCARD_defconfig           | 1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig         | 1 +
 configs/T1042RDB_PI_defconfig                  | 1 +
 configs/nokia_rx51_defconfig                   | 1 +
 configs/tbs2910_defconfig                      | 1 +
 drivers/video/Kconfig                          | 9 +++++++++
 include/configs/T104xRDB.h                     | 1 -
 include/configs/nokia_rx51.h                   | 1 -
 include/configs/tbs2910.h                      | 1 -
 scripts/config_whitelist.txt                   | 1 -
 18 files changed, 21 insertions(+), 8 deletions(-)

README +0 -4

index 18c5455..62449bf 100644
@@ -810,10 +810,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

configs/T1042D4RDB_NAND_defconfig +1 -0

index e40fe49..a644929 100644
@@ -38,4 +38,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

configs/T1042D4RDB_SDCARD_defconfig +1 -0

index 2665b05..ebd0990 100644
@@ -38,4 +38,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

configs/T1042D4RDB_SECURE_BOOT_defconfig +1 -0

index 1d2548b..54a8b5f 100644
@@ -31,6 +31,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

configs/T1042D4RDB_SPIFLASH_defconfig +1 -0

index 611881f..a0920bb 100644
@@ -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

configs/T1042D4RDB_defconfig +1 -0

index 7f172cd..35284df 100644
@@ -29,4 +29,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

configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +1 -0

index c80db93..e885816 100644
@@ -42,6 +42,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

configs/T1042RDB_PI_NAND_defconfig +1 -0

index cebe3c9..67ae007 100644
@@ -38,4 +38,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

configs/T1042RDB_PI_SDCARD_defconfig +1 -0

index 433c856..87d2a29 100644
@@ -38,4 +38,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

configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0

index 6c3ba81..b28b46c 100644
@@ -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

configs/T1042RDB_PI_defconfig +1 -0

index 8932572..571e4e9 100644
@@ -29,4 +29,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

configs/nokia_rx51_defconfig +1 -0

index 43f0552..0599c19 100644
@@ -22,3 +22,4 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
+CONFIG_CFB_CONSOLE_ANSI=y

configs/tbs2910_defconfig +1 -0

index 0194c0c..8c342eb 100644
@@ -38,4 +38,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

drivers/video/Kconfig +9 -0

index e6b8e9b..bd57009 100644
@@ -463,4 +463,13 @@ 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.
+
 endmenu

include/configs/T104xRDB.h +0 -1

index 6480e4e..cf59eb7 100644
@@ -484,7 +484,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_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

include/configs/nokia_rx51.h +0 -1

index 462bbe2..c106ae3 100644
@@ -230,7 +230,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

include/configs/tbs2910.h +0 -1

index 6ec1cc5..340ae9c 100644
@@ -74,7 +74,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

scripts/config_whitelist.txt +0 -1

index b6c1046..4669924 100644
@@ -493,7 +493,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

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 04:50 UTC #23 lore raw

PATCH v3 9/29 Convert CONFIG_CFB_CONSOLE_ANSI to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 9 lines

This converts the following to Kconfig:
CONFIG_CFB_CONSOLE_ANSI
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #24 lore raw

PATCH v3 10/29 Convert CONFIG_VIDEO_CT69000 to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_VIDEO_CT69000

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                       | 23 -----------------------
 configs/MIP405T_defconfig    |  1 +
 configs/MIP405_defconfig     |  1 +
 configs/PIP405_defconfig     |  1 +
 drivers/video/Kconfig        | 27 +++++++++++++++++++++++++++
 include/configs/MIP405.h     |  1 -
 include/configs/PIP405.h     |  1 -
 scripts/config_whitelist.txt |  1 -
 8 files changed, 30 insertions(+), 26 deletions(-)

README +0 ~~-23~~

index 62449bf..9e72a82 100644
@@ -1670,35 +1670,12 @@ CBFS (Coreboot Filesystem) support
 		instead.
 
 - Video support:
-		CONFIG_VIDEO_CT69000
-
-		Enable Chips & Technologies 69000 Video chip
-
 		CONFIG_VIDEO_SMI_LYNXEM
 		Enable Silicon Motion SMI 712/710/810 Video chip. The
 		video output is selected via environment 'videoout'
 		(1 = LCD and 2 = CRT). If videoout is undefined, CRT is
 		assumed.
 
-		For the CT69000 and SMI_LYNXEM drivers, videomode is
-		selected via environment 'videomode'. Two different ways
-		are possible:
-		- "videomode=num"   'num' is a standard LiLo mode numbers.
-		Following standard modes are supported	(* is default):
-
-		      Colors	640x480 800x600 1024x768 1152x864 1280x1024
-		-------------+---------------------------------------------
-		      8 bits |	0x301*	0x303	 0x305	  0x161	    0x307
-		     15 bits |	0x310	0x313	 0x316	  0x162	    0x319
-		     16 bits |	0x311	0x314	 0x317	  0x163	    0x31A
-		     24 bits |	0x312	0x315	 0x318	    ?	    0x31B
-		-------------+---------------------------------------------
-		(i.e. setenv videomode 317; saveenv; reset;)
-
-		- "videomode=bootargs" all the video parameters are parsed
-		from the bootargs. (See drivers/video/videomodes.c)
-
-
 		CONFIG_VIDEO_SED13806
 		Enable Epson SED13806 driver. This driver supports 8bpp
 		and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP

configs/MIP405T_defconfig +1 -0

index 3adc776..81e48dc 100644
@@ -14,3 +14,4 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
+CONFIG_VIDEO_CT69000=y

configs/MIP405_defconfig +1 -0

index 740d4e5..df0cd84 100644
@@ -17,3 +17,4 @@ CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_VIDEO_CT69000=y

configs/PIP405_defconfig +1 -0

index 7f46376..4adddea 100644
@@ -17,3 +17,4 @@ CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_VIDEO_CT69000=y

drivers/video/Kconfig +27 -0

index bd57009..34dcf65 100644
@@ -472,4 +472,31 @@ config CFB_CONSOLE_ANSI
 	  erase functions and limited graphics rendition control). Normal
 	  output from U-Boot will pass through this filter.
 
+config VIDEO_CT69000
+	bool "Enable Chips & Technologies 69000 video driver"
+	depends on VIDEO
+	help
+	  This enables a frame buffer driver for the Chips & Technologies
+	  ct69000, a fairly old graphics device (circa 2000) which is used
+	  on some hardware. It operates over the ISA bus, and supports
+	  some acceleration features.
+
+	  For the CT69000 and SMI_LYNXEM drivers, videomode is
+		selected via environment 'videomode'. Two different ways
+		are possible:
+		- "videomode=num"   'num' is a standard LiLo mode numbers.
+		Following standard modes are supported	(* is default):
+
+		      Colors	640x480 800x600 1024x768 1152x864 1280x1024
+		-------------+---------------------------------------------
+		      8 bits |	0x301*	0x303	 0x305	  0x161	    0x307
+		     15 bits |	0x310	0x313	 0x316	  0x162	    0x319
+		     16 bits |	0x311	0x314	 0x317	  0x163	    0x31A
+		     24 bits |	0x312	0x315	 0x318	    ?	    0x31B
+		-------------+---------------------------------------------
+		(i.e. setenv videomode 317; saveenv; reset;)
+
+		- "videomode=bootargs" all the video parameters are parsed
+		from the bootargs. (See drivers/video/videomodes.c)
+
 endmenu

include/configs/MIP405.h +0 -1

index e9f0369..501411b 100644
@@ -342,7 +342,6 @@
 /************************************************************
  * Video support
  ************************************************************/
-#define CONFIG_VIDEO_CT69000
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_VGA_AS_SINGLE_DEVICE

include/configs/PIP405.h +0 -1

index 6110f28..54dbe4c 100644
@@ -302,7 +302,6 @@
 /************************************************************
  * Video support
  ************************************************************/
-#define CONFIG_VIDEO_CT69000
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_VGA_AS_SINGLE_DEVICE

scripts/config_whitelist.txt +0 -1

index 4669924..e355222 100644
@@ -8276,7 +8276,6 @@ CONFIG_VIDEO_BMP_GZIP
 CONFIG_VIDEO_BMP_LOGO
 CONFIG_VIDEO_BMP_RLE8
 CONFIG_VIDEO_CORALP
-CONFIG_VIDEO_CT69000
 CONFIG_VIDEO_DA8XX
 CONFIG_VIDEO_DT_SIMPLEFB
 CONFIG_VIDEO_FONT_4X6

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:03 UTC #25 lore raw

PATCH v3 10/29 Convert CONFIG_VIDEO_CT69000 to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 10 lines

This converts the following to Kconfig:
    CONFIG_VIDEO_CT69000
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Quoted 9 lines

  README                       | 23 -----------------------
  configs/MIP405T_defconfig    |  1 +
  configs/MIP405_defconfig     |  1 +
  configs/PIP405_defconfig     |  1 +
  drivers/video/Kconfig        | 27 +++++++++++++++++++++++++++
  include/configs/MIP405.h     |  1 -
  include/configs/PIP405.h     |  1 -
  scripts/config_whitelist.txt |  1 -
  8 files changed, 30 insertions(+), 26 deletions(-)

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #26 lore raw

PATCH v3 11/29 Convert CONFIG_SYS_CONSOLE_BG_COL et al to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_BG_COL
CONFIG_SYS_CONSOLE_FG_COL

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                       |  5 ---
 configs/pxm2_defconfig       |  2 +
 configs/rut_defconfig        |  2 +
 drivers/video/Kconfig        | 22 ++++++++++
 drivers/video/cfb_console.c  | 98 ++++++++++++++++++++++----------------------
 drivers/video/ct69000.c      |  3 +-
 include/configs/pxm2.h       |  2 -
 include/configs/rut.h        |  2 -
 include/video_fb.h           |  8 ----
 scripts/config_whitelist.txt |  2 -
 10 files changed, 78 insertions(+), 68 deletions(-)

README +0 -5

index 9e72a82..53a9333 100644
@@ -810,11 +810,6 @@ The following options need to be configured:
 		port routines must be defined elsewhere
 		(i.e. serial_init(), serial_getc(), ...)
 
-		CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default
-			is 0x00.
-		CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default
-			is 0xa0.
-
 - Console Baudrate:
 		CONFIG_BAUDRATE - in bps
 		Select one of the baudrates listed in

configs/pxm2_defconfig +2 -0

index d667c9b..8b0e999 100644
@@ -59,3 +59,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Siemens AG"
 CONFIG_G_DNL_VENDOR_NUM=0x0908
 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_SYS_CONSOLE_BG_COL=0xff
+CONFIG_SYS_CONSOLE_FG_COL=0x00

configs/rut_defconfig +2 -0

index 56ba5e8..ecc3e72 100644
@@ -59,3 +59,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Siemens AG"
 CONFIG_G_DNL_VENDOR_NUM=0x0908
 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_SYS_CONSOLE_BG_COL=0xff
+CONFIG_SYS_CONSOLE_FG_COL=0x00

drivers/video/Kconfig +22 -0

index 34dcf65..2150830 100644
@@ -499,4 +499,26 @@ config VIDEO_CT69000
 		- "videomode=bootargs" all the video parameters are parsed
 		from the bootargs. (See drivers/video/videomodes.c)
 
+config SYS_CONSOLE_BG_COL
+	hex "Background colour"
+	depends on CFB_CONSOLE || VIDEO_CT69000
+	default 0x00
+	help
+	  Defines the background colour for the console. The value is from
+	  0x00 to 0xff and the meaning depends on the graphics card.
+	  Typically, 0x00 means black and 0xff means white. Do not set
+	  the background and foreground to the same colour or you will see
+	  nothing.
+
+config SYS_CONSOLE_FG_COL
+	hex "Foreground colour"
+	depends on CFB_CONSOLE || VIDEO_CT69000
+	default 0xa0
+	help
+	  Defines the foreground colour for the console. The value is from
+	  0x00 to 0xff and the meaning depends on the graphics card.
+	  Typically, 0x00 means black and 0xff means white. Do not set
+	  the background and foreground to the same colour or you will see
+	  nothing.
+
 endmenu

drivers/video/cfb_console.c +50 ~~-48~~

120 lines not on this page · raw message

drivers/video/ct69000.c +2 -1

index 22b3441..349da5e 100644
@@ -870,7 +870,8 @@ video_init_hw_cursor (int font_width, int font_height)
 	xr_80 = ctRead_i (CT_XR_O, 0x80);
 	xr_80 |= 0x1;		/* alternate palette select */
 	ctWrite_i (CT_XR_O, 0x80, xr_80);
-	video_set_lut (4, CONSOLE_FG_COL, CONSOLE_FG_COL, CONSOLE_FG_COL);
+	video_set_lut(4, CONFIG_SYS_CONSOLE_FG_COL, CONFIG_SYS_CONSOLE_FG_COL,
+		      CONFIG_SYS_CONSOLE_FG_COL);
 	/* position 4 is color 0 cursor 0 */
 	xr_80 &= 0xfe;		/* normal palette select */
 	ctWrite_i (CT_XR_O, 0x80, xr_80);

include/configs/pxm2.h +0 -2

index ba14593..6cc8d6c 100644
@@ -136,8 +136,6 @@
 #define DA8XX_LCD_CNTL_BASE	LCD_CNTL_BASE
 #define PWM_TICKS	0x1388
 #define PWM_DUTY	0x200
-#define CONFIG_SYS_CONSOLE_BG_COL	0xff
-#define CONFIG_SYS_CONSOLE_FG_COL	0x00
 #endif
 
 #endif	/* ! __CONFIG_PXM2_H */

include/configs/rut.h +0 -2

index ca812e4..11f9a25 100644
@@ -136,8 +136,6 @@
 #define CONFIG_ARCH_EARLY_INIT_R
 #define CONFIG_FORMIKE
 #define DISPL_PLL_SPREAD_SPECTRUM
-#define CONFIG_SYS_CONSOLE_BG_COL	0xff
-#define CONFIG_SYS_CONSOLE_FG_COL	0x00
 #endif
 
 #endif	/* ! __CONFIG_RUT_H */

include/video_fb.h +0 -8

index 55ec24d..b7e3aee 100644
@@ -18,14 +18,6 @@
 #ifndef _VIDEO_FB_H_
 #define _VIDEO_FB_H_
 
-#if defined(CONFIG_SYS_CONSOLE_FG_COL) && defined(CONFIG_SYS_CONSOLE_BG_COL)
-#define CONSOLE_BG_COL            CONFIG_SYS_CONSOLE_BG_COL
-#define CONSOLE_FG_COL            CONFIG_SYS_CONSOLE_FG_COL
-#else
-#define CONSOLE_BG_COL            0x00
-#define CONSOLE_FG_COL            0xa0
-#endif
-
 /*
  * Graphic Data Format (GDF) bits for VIDEO_DATA_FORMAT
  */

scripts/config_whitelist.txt +0 -2

index e355222..606341b 100644
@@ -4614,9 +4614,7 @@ CONFIG_SYS_CMXFCR_VALUE1
 CONFIG_SYS_CMXFCR_VALUE2
 CONFIG_SYS_CMXFCR_VALUE3
 CONFIG_SYS_CMXSCR_VALUE
-CONFIG_SYS_CONSOLE_BG_COL
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE
-CONFIG_SYS_CONSOLE_FG_COL
 CONFIG_SYS_CONSOLE_INFO_QUIET
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 CONFIG_SYS_CORE_SRAM

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:04 UTC #27 lore raw

PATCH v3 11/29 Convert CONFIG_SYS_CONSOLE_BG_COL et al to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 11 lines

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_BG_COL
CONFIG_SYS_CONSOLE_FG_COL
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Quoted 11 lines

  README                       |  5 ---
  configs/pxm2_defconfig       |  2 +
  configs/rut_defconfig        |  2 +
  drivers/video/Kconfig        | 22 ++++++++++
  drivers/video/cfb_console.c  | 98 ++++++++++++++++++++++----------------------
  drivers/video/ct69000.c      |  3 +-
  include/configs/pxm2.h       |  2 -
  include/configs/rut.h        |  2 -
  include/video_fb.h           |  8 ----
  scripts/config_whitelist.txt |  2 -
  10 files changed, 78 insertions(+), 68 deletions(-)

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #28 lore raw

PATCH v3 12/29 video: Drop the smiLynxEM driver

In reply to Simon Glass

This is not used in U-Boot anymore.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                       |   6 -
 drivers/video/Makefile       |   1 -
 drivers/video/cfb_console.c  |  13 -
 drivers/video/smiLynxEM.c    | 835 -------------------------------------------
 scripts/config_whitelist.txt |   1 -
 5 files changed, 856 deletions(-)
 delete mode 100644 drivers/video/smiLynxEM.c

README +0 -6

index 53a9333..cab4ebb 100644
@@ -1665,12 +1665,6 @@ CBFS (Coreboot Filesystem) support
 		instead.
 
 - Video support:
-		CONFIG_VIDEO_SMI_LYNXEM
-		Enable Silicon Motion SMI 712/710/810 Video chip. The
-		video output is selected via environment 'videoout'
-		(1 = LCD and 2 = CRT). If videoout is undefined, CRT is
-		assumed.
-
 		CONFIG_VIDEO_SED13806
 		Enable Epson SED13806 driver. This driver supports 8bpp
 		and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP

drivers/video/Makefile +0 -1

index 3f045fe..2df2015 100644
@@ -53,7 +53,6 @@ obj-$(CONFIG_VIDEO_S3C) += s3c-fb.o videomodes.o
 obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o
 obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
 obj-$(CONFIG_VIDEO_SM501) += sm501.o
-obj-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
 obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o videomodes.o
 obj-$(CONFIG_VIDEO_TEGRA20) += tegra.o
 obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o

drivers/video/cfb_console.c +0 ~~-13~~

index 949187c..a087d2e 100644
@@ -27,7 +27,6 @@
  *
  * (for SMI LynxE graphic chip)
  *
- * CONFIG_VIDEO_SMI_LYNXEM    - use graphic driver for SMI 710,712,810
  * VIDEO_FB_LITTLE_ENDIAN     - framebuffer organisation default: big endian
  * VIDEO_HW_RECTFILL	      - graphic driver supports hardware rectangle fill
  * VIDEO_HW_BITBLT	      - graphic driver supports hardware bit blt

@@ -87,18 +86,6 @@
 #include <linux/compiler.h>
 
 /*
- * Console device defines with SMI graphic
- * Any other graphic must change this section
- */
-
-#ifdef	CONFIG_VIDEO_SMI_LYNXEM
-
-#define VIDEO_FB_LITTLE_ENDIAN
-#define VIDEO_HW_RECTFILL
-#define VIDEO_HW_BITBLT
-#endif
-
-/*
  * Defines for the CT69000 driver
  */
 #ifdef	CONFIG_VIDEO_CT69000

drivers/video/smiLynxEM.c deleted +0 ~~-835~~

835 lines not on this page · raw message

scripts/config_whitelist.txt +0 -1

index 606341b..e5a7331 100644
@@ -8294,7 +8294,6 @@ CONFIG_VIDEO_SM501_16BPP
 CONFIG_VIDEO_SM501_32BPP
 CONFIG_VIDEO_SM501_8BPP
 CONFIG_VIDEO_SM501_PCI
-CONFIG_VIDEO_SMI_LYNXEM
 CONFIG_VIDEO_STD_TIMINGS
 CONFIG_VIDEO_SUNXI
 CONFIG_VIDEO_SW_CURSOR

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:05 UTC #29 lore raw

PATCH v3 12/29 video: Drop the smiLynxEM driver

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 9 lines

This is not used in U-Boot anymore.
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Quoted 7 lines

  README                       |   6 -
  drivers/video/Makefile       |   1 -
  drivers/video/cfb_console.c  |  13 -
  drivers/video/smiLynxEM.c    | 835 -------------------------------------------
  scripts/config_whitelist.txt |   1 -
  5 files changed, 856 deletions(-)

delete mode 100644 drivers/video/smiLynxEM.c

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #30 lore raw

PATCH v3 13/29 video: Drop the imx25lcdc driver

In reply to Simon Glass

This is not used anywhere in U-Boot.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 drivers/video/Makefile    |   1 -
 drivers/video/imx25lcdc.c | 121 ----------------------------------------------
 2 files changed, 122 deletions(-)
 delete mode 100644 drivers/video/imx25lcdc.c

drivers/video/Makefile +0 -1

index 2df2015..6bb9e28 100644
@@ -39,7 +39,6 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835.o
 obj-$(CONFIG_VIDEO_COREBOOT) += coreboot_fb.o
 obj-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o
 obj-$(CONFIG_VIDEO_DA8XX) += da8xx-fb.o videomodes.o
-obj-$(CONFIG_VIDEO_IMX25LCDC) += imx25lcdc.o videomodes.o
 obj-$(CONFIG_VIDEO_LCD_ANX9804) += anx9804.o
 obj-$(CONFIG_VIDEO_LCD_HITACHI_TX18D42VM) += hitachi_tx18d42vm_lcd.o
 obj-$(CONFIG_VIDEO_LCD_SSD2828) += ssd2828.o

drivers/video/imx25lcdc.c deleted +0 ~~-121~~

121 lines not on this page · raw message

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:05 UTC #31 lore raw

PATCH v3 13/29 video: Drop the imx25lcdc driver

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 6 lines

This is not used anywhere in U-Boot.
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---

Quoted 7 lines

Changes in v3: None
Changes in v2: None
  drivers/video/Makefile    |   1 -
  drivers/video/imx25lcdc.c | 121 ----------------------------------------------
  2 files changed, 122 deletions(-)
delete mode 100644 drivers/video/imx25lcdc.c

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #32 lore raw

PATCH v3 14/29 video: Drop the s3c-fb driver

In reply to Simon Glass

This is not used in U-Boot.

Signed-off-by Simon Glass <[email protected]>

Acked-by Minkyu Kang <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 drivers/video/Makefile      |   1 -
 drivers/video/cfb_console.c |   2 +-
 drivers/video/s3c-fb.c      | 172 --------------------------------------------
 3 files changed, 1 insertion(+), 174 deletions(-)
 delete mode 100644 drivers/video/s3c-fb.c

drivers/video/Makefile +0 -1

index 6bb9e28..412c948 100644
@@ -48,7 +48,6 @@ obj-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o
 obj-$(CONFIG_VIDEO_MVEBU) += mvebu_lcd.o
 obj-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o
 obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
-obj-$(CONFIG_VIDEO_S3C) += s3c-fb.o videomodes.o
 obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o
 obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
 obj-$(CONFIG_VIDEO_SM501) += sm501.o

drivers/video/cfb_console.c +1 -1

index a087d2e..aca4444 100644
@@ -104,7 +104,7 @@
 #define VIDEO_HW_BITBLT
 #endif
 
-#if defined(CONFIG_VIDEO_MXS) || defined(CONFIG_VIDEO_S3C)
+#if defined(CONFIG_VIDEO_MXS)
 #define VIDEO_FB_16BPP_WORD_SWAP
 #endif

drivers/video/s3c-fb.c deleted +0 ~~-172~~

172 lines not on this page · raw message

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:06 UTC #33 lore raw

PATCH v3 14/29 video: Drop the s3c-fb driver

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 7 lines

This is not used in U-Boot.
Signed-off-by Simon Glass <[email protected]>
Acked-by Minkyu Kang <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---

Quoted 8 lines

Changes in v3: None
Changes in v2: None

  drivers/video/Makefile      |   1 -
  drivers/video/cfb_console.c |   2 +-
  drivers/video/s3c-fb.c      | 172 --------------------------------------------
  3 files changed, 1 insertion(+), 174 deletions(-)

delete mode 100644 drivers/video/s3c-fb.c

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #34 lore raw

PATCH v3 15/29 video: Drop the sed13806 driver

In reply to Simon Glass

This is not used in U-Boot.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                       |   5 -
 drivers/video/Makefile       |   1 -
 drivers/video/cfb_console.c  |   9 --
 drivers/video/sed13806.c     | 286 -------------------------------------------
 include/sed13806.h           |  81 ------------
 scripts/config_whitelist.txt |   1 -
 6 files changed, 383 deletions(-)
 delete mode 100644 drivers/video/sed13806.c
 delete mode 100644 include/sed13806.h

README +0 -5

index cab4ebb..6367fdd 100644
@@ -1665,11 +1665,6 @@ CBFS (Coreboot Filesystem) support
 		instead.
 
 - Video support:
-		CONFIG_VIDEO_SED13806
-		Enable Epson SED13806 driver. This driver supports 8bpp
-		and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP
-		or CONFIG_VIDEO_SED13806_16BPP
-
 		CONFIG_FSL_DIU_FB
 		Enable the Freescale DIU video driver.	Reference boards for
 		SOCs that have a DIU should define this macro to enable DIU

drivers/video/Makefile +0 -1

index 412c948..ff3617b 100644
@@ -49,7 +49,6 @@ obj-$(CONFIG_VIDEO_MVEBU) += mvebu_lcd.o
 obj-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o
 obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
 obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o
-obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
 obj-$(CONFIG_VIDEO_SM501) += sm501.o
 obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o videomodes.o
 obj-$(CONFIG_VIDEO_TEGRA20) += tegra.o

drivers/video/cfb_console.c +0 -9

index aca4444..ac7c402 100644
@@ -95,15 +95,6 @@
 #define VIDEO_HW_BITBLT
 #endif
 
-/*
- * Defines for the SED13806 driver
- */
-#ifdef CONFIG_VIDEO_SED13806
-#define VIDEO_FB_LITTLE_ENDIAN
-#define VIDEO_HW_RECTFILL
-#define VIDEO_HW_BITBLT
-#endif
-
 #if defined(CONFIG_VIDEO_MXS)
 #define VIDEO_FB_16BPP_WORD_SWAP
 #endif

drivers/video/sed13806.c deleted +0 ~~-286~~

286 lines not on this page · raw message

include/sed13806.h deleted +0 ~~-81~~

81 lines not on this page · raw message

scripts/config_whitelist.txt +0 -1

index e5a7331..06ac316 100644
@@ -8288,7 +8288,6 @@ CONFIG_VIDEO_MXS
 CONFIG_VIDEO_MXS_MODE_SYSTEM
 CONFIG_VIDEO_OMAP3
 CONFIG_VIDEO_ONBOARD
-CONFIG_VIDEO_SED13806
 CONFIG_VIDEO_SM501
 CONFIG_VIDEO_SM501_16BPP
 CONFIG_VIDEO_SM501_32BPP

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:06 UTC #35 lore raw

PATCH v3 15/29 video: Drop the sed13806 driver

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 16 lines

This is not used in U-Boot.
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None
  README                       |   5 -
  drivers/video/Makefile       |   1 -
  drivers/video/cfb_console.c  |   9 --
  drivers/video/sed13806.c     | 286 -------------------------------------------
  include/sed13806.h           |  81 ------------
  scripts/config_whitelist.txt |   1 -
  6 files changed, 383 deletions(-)

Quoted 2 lines

delete mode 100644 drivers/video/sed13806.c
delete mode 100644 include/sed13806.h

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #36 lore raw

PATCH v3 16/29 Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_VGA_AS_SINGLE_DEVICE

Once we migrate to driver model for video, we should be able to drop this option.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v3: None
Changes in v2: None

 configs/Chuwi_V7_CW0825_defconfig                       |  1 +
 configs/MSI_Primo81_defconfig                           |  1 +
 configs/bayleybay_defconfig                             |  1 +
 configs/chromebook_link_defconfig                       |  1 +
 configs/chromebox_panther_defconfig                     |  1 +
 configs/conga-qeval20-qa3-e3845-internal-uart_defconfig |  1 +
 configs/conga-qeval20-qa3-e3845_defconfig               |  1 +
 configs/crownbay_defconfig                              |  1 +
 configs/dfi-bt700-q7x-151_defconfig                     |  1 +
 configs/minnowmax_defconfig                             |  1 +
 configs/qemu-x86_defconfig                              |  1 +
 configs/qemu-x86_efi_payload32_defconfig                |  1 +
 configs/qemu-x86_efi_payload64_defconfig                |  1 +
 configs/som-db5800-som-6867_defconfig                   |  1 +
 configs/theadorable-x86-dfi-bt700_defconfig             |  1 +
 configs/theadorable_debug_defconfig                     |  1 +
 configs/theadorable_defconfig                           |  1 +
 drivers/video/Kconfig                                   | 10 ++++++++++
 drivers/video/cfb_console.c                             |  6 ------
 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                                |  4 ----
 include/configs/advantech_dms-ba16.h                    |  1 -
 include/configs/aria.h                                  |  4 ----
 include/configs/aristainetos-common.h                   |  1 -
 include/configs/cgtqmx6eval.h                           |  1 -
 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/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 -
 include/configs/x86-common.h                            |  1 -
 scripts/config_whitelist.txt                            |  1 -
 76 files changed, 27 insertions(+), 70 deletions(-)

configs/Chuwi_V7_CW0825_defconfig +1 -0

index 8507f73..a67038b 100644
@@ -22,3 +22,4 @@ CONFIG_USB_MUSB_HOST=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
+CONFIG_CFB_CONSOLE=y

configs/MSI_Primo81_defconfig +1 -0

index 8847271..e9d5be4 100644
@@ -25,3 +25,4 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9"
 CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
 CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
 CONFIG_VIDEO_LCD_SPI_MISO="PH12"
+CONFIG_CFB_CONSOLE=y

configs/bayleybay_defconfig +1 -0

index aa4bfe0..6de6c1e 100644
@@ -58,4 +58,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/chromebook_link_defconfig +1 -0

index 39b4f73..2f35b77 100644
@@ -62,5 +62,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

configs/chromebox_panther_defconfig +1 -0

index 4e24d60..0d5aaa7 100644
@@ -54,5 +54,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0

index e869bff..513f3c4 100644
@@ -66,4 +66,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/conga-qeval20-qa3-e3845_defconfig +1 -0

index bbad68e..cc6385b 100644
@@ -65,4 +65,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/crownbay_defconfig +1 -0

index 5d90bd2..a1587ef 100644
@@ -51,4 +51,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/dfi-bt700-q7x-151_defconfig +1 -0

index 3ae2aa5..3c6b94f 100644
@@ -63,4 +63,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/minnowmax_defconfig +1 -0

index fc38642..65da516 100644
@@ -62,4 +62,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/qemu-x86_defconfig +1 -0

index 9bbbcd9..9bd9c1d 100644
@@ -49,4 +49,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/qemu-x86_efi_payload32_defconfig +1 -0

index 3dfc344..9374dde 100644
@@ -46,6 +46,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y

configs/qemu-x86_efi_payload64_defconfig +1 -0

index 87afb73..85dc3e9 100644
@@ -46,6 +46,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y

configs/som-db5800-som-6867_defconfig +1 -0

index 355f97f..bbdcbc0 100644
@@ -60,4 +60,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/theadorable-x86-dfi-bt700_defconfig +1 -0

index b110798..44f7b7c 100644
@@ -60,4 +60,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/theadorable_debug_defconfig +1 -0

index 2596d78..51deddc 100644
@@ -50,3 +50,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_MVEBU=y
+CONFIG_CFB_CONSOLE=y

configs/theadorable_defconfig +1 -0

index dc39c18..9c7a79f 100644
@@ -40,5 +40,6 @@ CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_VIDEO_MVEBU=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_REGEX=y
 CONFIG_LIB_RAND=y

drivers/video/Kconfig +10 -0

index 2150830..2c5ef2b 100644
@@ -472,6 +472,16 @@ config CFB_CONSOLE_ANSI
 	  erase functions and limited graphics rendition control). Normal
 	  output from U-Boot will pass through this filter.
 
+config VGA_AS_SINGLE_DEVICE
+	bool "Set the video as an output-only device"
+	depends on CFB_CONSOLE
+	default y
+	help
+	  If enable the framebuffer device will be initialized as an
+	  output-only device. The Keyboard driver will not be set up. This
+	  may be used if you have no keyboard device, or more than one
+	  (USB Keyboard, AT Keyboard).
+
 config VIDEO_CT69000
 	bool "Enable Chips & Technologies 69000 video driver"
 	depends on VIDEO

drivers/video/cfb_console.c +0 -6

index ac7c402..3a8e20b 100644
@@ -58,12 +58,6 @@
  *					info);
  *				that fills a info buffer at i=row.
  *				s.a: board/eltec/bab7xx.
- * CONFIG_VGA_AS_SINGLE_DEVICE - If set the framebuffer device will be
- *				initialized as an output only device.
- *				The Keyboard driver will not be
- *				set-up.  This may be used, if you have
- *				no or more than one Keyboard devices
- *				(USB Keyboard, AT Keyboard).
  *
  * CONFIG_VIDEO_SW_CURSOR:    - Draws a cursor after the last
  *				character. No blinking is provided.

include/configs/MIP405.h +0 -1

index 501411b..0fc3131 100644
@@ -344,7 +344,6 @@
  ************************************************************/
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #undef CONFIG_VIDEO_ONBOARD
 /************************************************************

include/configs/MPC8536DS.h +0 -1

index e4fec53..0900540 100644
@@ -508,7 +508,6 @@
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT

include/configs/MPC8544DS.h +0 -1

index 23e8de4..76eb674 100644
@@ -281,7 +281,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET

include/configs/MPC8572DS.h +0 -1

index 1571c8a..3f43d75 100644
@@ -468,7 +468,6 @@
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET

include/configs/MPC8610HPCD.h +0 -1

index 699293c..c5295f9 100644
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x2c000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

include/configs/MPC8641HPCN.h +0 -1

index ce4e33f..37dd44e 100644
@@ -381,7 +381,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE2_IO_VIRT

include/configs/P1022DS.h +0 -2

index c4e3e65..e391088 100644
@@ -382,7 +382,6 @@
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x10000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

@@ -403,7 +402,6 @@
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif
 
 /* I2C */

include/configs/PIP405.h +0 -1

index 54dbe4c..2b3cf19 100644
@@ -304,7 +304,6 @@
  ************************************************************/
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_ONBOARD		/* Video controller is on-board */

include/configs/T102xQDS.h +0 -1

index d8a53bc..1c18495 100644
@@ -503,7 +503,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

include/configs/T102xRDB.h +0 -1

index d8792d6..9b0b917 100644
@@ -501,7 +501,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

include/configs/T1040QDS.h +0 -1

index af63dd3..2ae6573 100644
@@ -415,7 +415,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

include/configs/T104xRDB.h +0 -1

index cf59eb7..4b5e451 100644
@@ -485,7 +485,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

include/configs/TQM5200.h +0 -1

index 9ecc363..c5705f5 100644
@@ -108,7 +108,6 @@
 #define CONFIG_VIDEO_BMP_LOGO
 #endif
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #endif /* #ifndef CONFIG_TQM5200S */

include/configs/ac14xx.h +0 -4

index f1013c4..2f3668a 100644
@@ -32,10 +32,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0xFFF00000
 
-#if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#endif
-
 #define CONFIG_SYS_MPC512X_CLKIN	25000000	/* in Hz */
 #define SCFR1_IPS_DIV			2
 #define SCFR1_LPC_DIV			2

include/configs/advantech_dms-ba16.h +0 -1

index 840e3d9..2cbbac2 100644
@@ -276,7 +276,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/aria.h +0 -4

index 7b7e6e2..d7b043c 100644
@@ -39,10 +39,6 @@
 
 /* video */
 
-#if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#endif
-
 /* CONFIG_PCI is defined at config time */
 
 #define CONFIG_SYS_MPC512X_CLKIN	33000000	/* in Hz */

include/configs/aristainetos-common.h +0 -1

index 0ec5732..93083fc 100644
@@ -231,7 +231,6 @@
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 /* check this console not needed, after test remove it */
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/cgtqmx6eval.h +0 -1

index 1c76b5e..b016f20 100644
@@ -89,7 +89,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/cm_fx6.h +0 -1

index 55a5f93..bb036dc 100644
@@ -256,7 +256,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_IMX_HDMI
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 
 #define CONFIG_SPLASH_SCREEN

include/configs/colibri_imx7.h +0 -1

index d523af8..ded26f9 100644
@@ -227,7 +227,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

include/configs/controlcenterd.h +0 -1

index 47a3002..6770bd0 100644
@@ -225,7 +225,6 @@
  */
 #define CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x10000)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
 
 /*

include/configs/digsy_mtc.h +0 -1

index b90554f..2551de4 100644
@@ -81,7 +81,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)	/* decompressed img */

include/configs/ea20.h +0 -1

index d3ca706..8c35688 100644
@@ -102,7 +102,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_CONSOLE_INFO_QUIET

include/configs/embestmx6boards.h +0 -1

index e115fd5..9e0c945 100644
@@ -118,7 +118,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/ge_bx50v3.h +0 -1

index 3baac67..c1053f8 100644
@@ -307,7 +307,6 @@
 /* Framebuffer */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

include/configs/gw_ventana.h +0 -1

index fa3a7286..d3bc836 100644
@@ -181,7 +181,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_CMD_HDMIDETECT

include/configs/icon.h +0 -1

index f858b99..c38a254 100644
@@ -134,7 +134,6 @@
 #define VIDEO_FB_LITTLE_ENDIAN
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/imx31_phycore.h +0 -1

index 5a20437..f833f7d 100644
@@ -184,7 +184,6 @@
 #define CONFIG_VIDEO_MX3
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_16BPP

include/configs/ipek01.h +0 -1

index 99200d1..436bc75 100644
@@ -51,7 +51,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP

include/configs/ls1021aqds.h +0 -1

index a19f206..99a7979 100644
@@ -451,7 +451,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_FSL_DCU_FB
 #define CONFIG_CMD_BMP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO

include/configs/ls1021atwr.h +0 -1

index 3c596f3..d1e01fe 100644
@@ -332,7 +332,6 @@
 
 #ifdef CONFIG_FSL_DCU_FB
 #define CONFIG_CMD_BMP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO

include/configs/lwmon5.h +0 -1

index 58446b5..d812e66 100644
@@ -360,7 +360,6 @@
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN

include/configs/m53evk.h +0 -1

index 3913fcd..07031e5 100644
@@ -201,7 +201,6 @@
  */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SPLASH_SCREEN

include/configs/mcx.h +0 -1

index 25ab0c9..00cbe63 100644
@@ -371,7 +371,6 @@
 #define CONFIG_NET_RETRY_COUNT 10
 #endif
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_CMD_BMP

include/configs/mpc5121ads.h +0 -1

index ac3ac35..50a6ccd 100644
@@ -39,7 +39,6 @@
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_IMMR + 0x2100)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

include/configs/mt_ventoux.h +0 -1

index 3ec2358..2420612 100644
@@ -51,7 +51,6 @@
 #define CONFIG_FPGA_DELAY() udelay(1)
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_CMD_BMP

include/configs/mx51evk.h +0 -1

index 4ecd7fd..968662d 100644
@@ -97,7 +97,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/mx53loco.h +0 -1

index 89e5557..258a856 100644
@@ -216,7 +216,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/mx6cuboxi.h +0 -1

index 158858f..82957d6 100644
@@ -35,7 +35,6 @@
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK		260000000
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

include/configs/mx6sabre_common.h +0 -1

index fb380ba..9a0b0a2 100644
@@ -209,7 +209,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/mx6sxsabresd.h +0 -1

index e288ad8..b45ad72 100644
@@ -209,7 +209,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

include/configs/mx6ul_14x14_evk.h +0 -1

index c9ca034..8002796 100644
@@ -232,7 +232,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

include/configs/mx7dsabresd.h +0 -1

index da75d03..bf0cb2e 100644
@@ -256,7 +256,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

include/configs/mxs.h +0 -1

index 52083c8..33459d7 100644
@@ -145,7 +145,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif
 
 /* MMC */

include/configs/nitrogen6x.h +0 -1

index d18c177..63ef4e7 100644
@@ -93,7 +93,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/novena.h +0 -1

index 40194f0..0983b96 100644
@@ -161,7 +161,6 @@
 /* Video output */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP

include/configs/pdm360ng.h +0 -1

index acadf72..f5fcef8 100644
@@ -41,7 +41,6 @@
 /* Video */
 
 #if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_RLE8

include/configs/pxm2.h +0 -1

index 6cc8d6c..2aa184a 100644
@@ -126,7 +126,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO

include/configs/rut.h +0 -1

index 11f9a25..3d7b85f 100644
@@ -120,7 +120,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO

include/configs/sequoia.h +0 -1

index facfdac..153646f 100644
@@ -411,7 +411,6 @@
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SPLASH_SCREEN
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
 #endif

include/configs/socrates.h +0 -1

index 5abdd23..9d92a06 100644
@@ -176,7 +176,6 @@
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP

include/configs/sunxi-common.h +0 -1

index 78333c6..3b9c688 100644
@@ -298,7 +298,6 @@ extern int soft_i2c_gpio_scl;
 
 /* allow both serial and cfb console. */
 /* stop x86 thinking in cfbconsole from trying to init a pc keyboard */
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 
 #endif /* CONFIG_VIDEO */

include/configs/tbs2910.h +0 -1

index 340ae9c..da1dea8 100644
@@ -75,7 +75,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK		260000000
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP

include/configs/theadorable.h +0 -1

index 365019a..fe2ca6f 100644
@@ -96,7 +96,6 @@
 /* Enable LCD and reserve 512KB from top of memory*/
 #define CONFIG_SYS_MEM_TOP_HIDE		0x80000
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
 
 /* FPGA programming support */

include/configs/wandboard.h +0 -1

index aacf4ef..4d219e2 100644
@@ -75,7 +75,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

include/configs/x86-common.h +0 -1

index 7633a43..c1f6b91 100644
@@ -131,7 +131,6 @@
  */
 #define CONFIG_VIDEO_SW_CURSOR
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CONSOLE_SCROLL_LINES 5
 
 /*-----------------------------------------------------------------------

scripts/config_whitelist.txt +0 -1

index 06ac316..3bc1b09 100644
@@ -8267,7 +8267,6 @@ CONFIG_VERY_BIG_RAM
 CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
 CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
 CONFIG_VF610
-CONFIG_VGA_AS_SINGLE_DEVICE
 CONFIG_VID
 CONFIG_VIDEO_BCM2835
 CONFIG_VIDEO_BMP_GZIP

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:07 UTC #37 lore raw

PATCH v3 16/29 Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 11 lines

This converts the following to Kconfig:
CONFIG_VGA_AS_SINGLE_DEVICE
Once we migrate to driver model for video, we should be able to drop this option.
Signed-off-by Simon Glass <[email protected]>
---
Changes in v3: None
Changes in v2: None

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Tom Rini

2016-10-01 02:38 UTC #38 lore raw

PATCH v3 16/29 Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig

In reply to Simon Glass

Quoted 7 lines · Simon Glass

This converts the following to Kconfig:
CONFIG_VGA_AS_SINGLE_DEVICE
Once we migrate to driver model for video, we should be able to drop this option.
Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160930/ff2154e2/attachment.sig>

Simon Glass

author

2016-09-29 20:23 UTC #39 lore raw

PATCH v3 17/29 video: Drop CONFIG_VIDEO_HW_CURSOR

In reply to Simon Glass

This is not used in U-Boot.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 drivers/video/cfb_console.c  | 33 +-----------------
 drivers/video/ct69000.c      | 79 --------------------------------------------
 include/video_fb.h           |  4 ---
 scripts/config_whitelist.txt |  1 -
 4 files changed, 1 insertion(+), 116 deletions(-)

drivers/video/cfb_console.c +1 ~~-32~~

index 3a8e20b..a99fc00 100644
@@ -63,14 +63,6 @@
  *				character. No blinking is provided.
  *				Uses the macros CURSOR_SET and
  *				CURSOR_OFF.
- *
- * CONFIG_VIDEO_HW_CURSOR:    - Uses the hardware cursor capability
- *				of the graphic chip. Uses the macro
- *				CURSOR_SET. ATTENTION: If booting an
- *				OS, the display driver must disable
- *				the hardware register of the graphic
- *				chip. Otherwise a blinking field is
- *				displayed.
  */
 
 #include <common.h>

@@ -154,13 +146,8 @@
  * CONFIG_VIDEO_SW_CURSOR: Draws a cursor after the last character. No
  *			   blinking is provided. Uses the macros CURSOR_SET
  *			   and CURSOR_OFF.
- * CONFIG_VIDEO_HW_CURSOR: Uses the hardware cursor capability of the
- *			   graphic chip. Uses the macro CURSOR_SET.
- *			   ATTENTION: If booting an OS, the display driver
- *			   must disable the hardware register of the graphic
- *			   chip. Otherwise a blinking field is displayed
  */
-#if !defined(CONFIG_VIDEO_SW_CURSOR) && !defined(CONFIG_VIDEO_HW_CURSOR)
+#if !defined(CONFIG_VIDEO_SW_CURSOR)
 /* no Cursor defined */
 #define CURSOR_ON
 #define CURSOR_OFF

@@ -168,10 +155,6 @@
 #endif
 
 #if defined(CONFIG_VIDEO_SW_CURSOR)
-#if defined(CONFIG_VIDEO_HW_CURSOR)
-#error	only one of CONFIG_VIDEO_SW_CURSOR or CONFIG_VIDEO_HW_CURSOR can be \
-	defined
-#endif
 void console_cursor(int state);
 
 #define CURSOR_ON  console_cursor(1)

@@ -179,17 +162,6 @@ void console_cursor(int state);
 #define CURSOR_SET video_set_cursor()
 #endif /* CONFIG_VIDEO_SW_CURSOR */
 
-#ifdef CONFIG_VIDEO_HW_CURSOR
-#ifdef	CURSOR_ON
-#error	only one of CONFIG_VIDEO_SW_CURSOR or CONFIG_VIDEO_HW_CURSOR can be \
-	defined
-#endif
-#define CURSOR_ON
-#define CURSOR_OFF
-#define CURSOR_SET video_set_hw_cursor(console_col * VIDEO_FONT_WIDTH, \
-		  (console_row * VIDEO_FONT_HEIGHT) + video_logo_height)
-#endif /* CONFIG_VIDEO_HW_CURSOR */
-
 #ifdef	CONFIG_VIDEO_LOGO
 #ifdef	CONFIG_VIDEO_BMP_LOGO
 #include <bmp_logo.h>

@@ -2056,9 +2028,6 @@ static int video_init(void)
 		return -1;
 
 	video_fb_address = (void *) VIDEO_FB_ADRS;
-#ifdef CONFIG_VIDEO_HW_CURSOR
-	video_init_hw_cursor(VIDEO_FONT_WIDTH, VIDEO_FONT_HEIGHT);
-#endif
 
 	cfb_do_flush_cache = cfb_fb_is_in_dram() && dcache_status();

drivers/video/ct69000.c +0 ~~-79~~

85 lines not on this page · raw message

include/video_fb.h +0 -4

index b7e3aee..b008853 100644
@@ -88,9 +88,5 @@ void video_set_lut (
     unsigned char g,              /* green */
     unsigned char b               /* blue */
     );
-#ifdef CONFIG_VIDEO_HW_CURSOR
-void video_set_hw_cursor(int x, int y); /* x y in pixel */
-void video_init_hw_cursor(int font_width, int font_height);
-#endif
 
 #endif /*_VIDEO_FB_H_ */

scripts/config_whitelist.txt +0 -1

index 3bc1b09..9d66e6a 100644
@@ -8276,7 +8276,6 @@ CONFIG_VIDEO_CORALP
 CONFIG_VIDEO_DA8XX
 CONFIG_VIDEO_DT_SIMPLEFB
 CONFIG_VIDEO_FONT_4X6
-CONFIG_VIDEO_HW_CURSOR
 CONFIG_VIDEO_IPUV3
 CONFIG_VIDEO_LCD_I2C_BUS
 CONFIG_VIDEO_LOGO

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:08 UTC #40 lore raw

PATCH v3 17/29 video: Drop CONFIG_VIDEO_HW_CURSOR

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 8 lines

This is not used in U-Boot.
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #41 lore raw

PATCH v3 18/29 Convert CONFIG_VIDEO_SW_CURSOR to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_VIDEO_SW_CURSOR

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 drivers/video/Kconfig             | 10 ++++++++++
 drivers/video/cfb_console.c       |  6 ------
 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/cm_fx6.h          |  1 -
 include/configs/colibri_imx7.h    |  1 -
 include/configs/digsy_mtc.h       |  1 -
 include/configs/icon.h            |  1 -
 include/configs/imx31_phycore.h   |  1 -
 include/configs/ipek01.h          |  1 -
 include/configs/lwmon5.h          |  1 -
 include/configs/mpc5121ads.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/nokia_rx51.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/x86-common.h      |  1 -
 scripts/config_whitelist.txt      |  1 -
 34 files changed, 10 insertions(+), 39 deletions(-)

drivers/video/Kconfig +10 -0

index 2c5ef2b..4caa92a 100644
@@ -482,6 +482,16 @@ config VGA_AS_SINGLE_DEVICE
 	  may be used if you have no keyboard device, or more than one
 	  (USB Keyboard, AT Keyboard).
 
+config VIDEO_SW_CURSOR
+	bool "Enable a software cursor"
+	depends on CFB_CONSOLE
+	default y if CFB_CONSOLE
+	help
+	  This draws a cursor after the last character. No blinking is
+	  provided. This makes it possible to see the current cursor
+	  position when entering text on the console. It is recommended to
+	  enable this.
+
 config VIDEO_CT69000
 	bool "Enable Chips & Technologies 69000 video driver"
 	depends on VIDEO

drivers/video/cfb_console.c +0 -6

index a99fc00..56d3c15 100644
@@ -141,12 +141,6 @@
 #include <splash.h>
 #endif
 
-/*
- * Cursor definition:
- * CONFIG_VIDEO_SW_CURSOR: Draws a cursor after the last character. No
- *			   blinking is provided. Uses the macros CURSOR_SET
- *			   and CURSOR_OFF.
- */
 #if !defined(CONFIG_VIDEO_SW_CURSOR)
 /* no Cursor defined */
 #define CURSOR_ON

include/configs/MIP405.h +0 -1

index 0fc3131..257fa47 100644
@@ -344,7 +344,6 @@
  ************************************************************/
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
 #undef CONFIG_VIDEO_ONBOARD
 /************************************************************
  * USB support EXPERIMENTAL

include/configs/MPC8536DS.h +0 -1

index 0900540..cba393a 100644
@@ -507,7 +507,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT

include/configs/MPC8544DS.h +0 -1

index 76eb674..c3d69cb 100644
@@ -280,7 +280,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET

include/configs/MPC8572DS.h +0 -1

index 3f43d75..509728c 100644
@@ -467,7 +467,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET

include/configs/MPC8610HPCD.h +0 -1

index c5295f9..7882b35 100644
@@ -26,7 +26,6 @@
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x2c000)
 #define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

include/configs/MPC8641HPCN.h +0 -1

index 37dd44e..2c15f3d 100644
@@ -380,7 +380,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE2_IO_VIRT

include/configs/P1022DS.h +0 -2

index e391088..347a88d 100644
@@ -381,7 +381,6 @@
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x10000)
 #define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

@@ -398,7 +397,6 @@
 #ifdef CONFIG_ATI
 #define VIDEO_IO_OFFSET		CONFIG_SYS_PCIE1_IO_VIRT
 #define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET

include/configs/PIP405.h +0 -1

index 2b3cf19..70e75c1 100644
@@ -304,7 +304,6 @@
  ************************************************************/
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_ONBOARD		/* Video controller is on-board */
 
 /************************************************************

include/configs/T102xQDS.h +0 -1

index 1c18495..1a97858 100644
@@ -502,7 +502,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_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

include/configs/T102xRDB.h +0 -1

index 9b0b917..c471b60 100644
@@ -500,7 +500,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_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

include/configs/T1040QDS.h +0 -1

index 2ae6573..5808868 100644
@@ -414,7 +414,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_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

include/configs/T104xRDB.h +0 -1

index 4b5e451..d542d15 100644
@@ -484,7 +484,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

include/configs/TQM5200.h +0 -1

index c5705f5..06d2be5 100644
@@ -108,7 +108,6 @@
 #define CONFIG_VIDEO_BMP_LOGO
 #endif
 
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #endif /* #ifndef CONFIG_TQM5200S */

include/configs/cm_fx6.h +0 -1

index bb036dc..325c019 100644
@@ -256,7 +256,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_IMX_HDMI
-#define CONFIG_VIDEO_SW_CURSOR
 
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SOURCE

include/configs/colibri_imx7.h +0 -1

index ded26f9..3acdc74 100644
@@ -226,7 +226,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

include/configs/digsy_mtc.h +0 -1

index 2551de4..26554b7 100644
@@ -80,7 +80,6 @@
 #define CONFIG_VIDEO_CORALP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)	/* decompressed img */

include/configs/icon.h +0 -1

index c38a254..3a72a66 100644
@@ -134,7 +134,6 @@
 #define VIDEO_FB_LITTLE_ENDIAN
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CFG_CONSOLE_IS_IN_ENV

include/configs/imx31_phycore.h +0 -1

index f833f7d..968c26d 100644
@@ -183,7 +183,6 @@
 
 #define CONFIG_VIDEO_MX3
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_16BPP

include/configs/ipek01.h +0 -1

index 436bc75..5298376 100644
@@ -51,7 +51,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)	/* decompressed img */

include/configs/lwmon5.h +0 -1

index d812e66..2e89b1a 100644
@@ -360,7 +360,6 @@
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
 
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 
 /*

include/configs/mpc5121ads.h +0 -1

index 50a6ccd..509097f 100644
@@ -38,7 +38,6 @@
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_IMMR + 0x2100)
 #define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

include/configs/mx6sxsabresd.h +0 -1

index b45ad72..ecaeccf 100644
@@ -208,7 +208,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

include/configs/mx6ul_14x14_evk.h +0 -1

index 8002796..df11e08 100644
@@ -231,7 +231,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

include/configs/mx7dsabresd.h +0 -1

index bf0cb2e..557aee5 100644
@@ -255,7 +255,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

include/configs/mxs.h +0 -1

index 33459d7..df0cc23 100644
@@ -144,7 +144,6 @@
 /* LCD */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
-#define CONFIG_VIDEO_SW_CURSOR
 #endif
 
 /* MMC */

include/configs/nokia_rx51.h +0 -1

index c106ae3..eafa415 100644
@@ -233,7 +233,6 @@
 #define CONFIG_VIDEO_LOGO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 
 /* functions for cfb_console */

include/configs/sequoia.h +0 -1

index 153646f..ff2f6c0 100644
@@ -408,7 +408,6 @@
 #define CONFIG_ATI_RADEON_FB		/* use radeon framebuffer driver */
 #define VIDEO_IO_OFFSET			0xe8000000
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS		VIDEO_IO_OFFSET
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP

include/configs/socrates.h +0 -1

index 9d92a06..16e4b02 100644
@@ -176,7 +176,6 @@
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)	/* decompressed img */

include/configs/sunxi-common.h +0 -1

index 3b9c688..a2969e7 100644
@@ -290,7 +290,6 @@ extern int soft_i2c_gpio_scl;
 
 #define CONFIG_VIDEO_SUNXI
 
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_STD_TIMINGS
 #define CONFIG_I2C_EDID

include/configs/tbs2910.h +0 -1

index da1dea8..8fdeaa1 100644
@@ -74,7 +74,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK		260000000
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP

include/configs/x86-common.h +0 -1

index c1f6b91..352de68 100644
@@ -129,7 +129,6 @@
 /*-----------------------------------------------------------------------
  * Video Configuration
  */
-#define CONFIG_VIDEO_SW_CURSOR
 #define VIDEO_FB_16BPP_WORD_SWAP
 #define CONFIG_CONSOLE_SCROLL_LINES 5

scripts/config_whitelist.txt +0 -1

index 9d66e6a..dd36855 100644
@@ -8293,7 +8293,6 @@ CONFIG_VIDEO_SM501_8BPP
 CONFIG_VIDEO_SM501_PCI
 CONFIG_VIDEO_STD_TIMINGS
 CONFIG_VIDEO_SUNXI
-CONFIG_VIDEO_SW_CURSOR
 CONFIG_VIDEO_VCXK
 CONFIG_VID_FLS_ENV
 CONFIG_VM86

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:11 UTC #42 lore raw

PATCH v3 18/29 Convert CONFIG_VIDEO_SW_CURSOR to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 9 lines

This converts the following to Kconfig:
CONFIG_VIDEO_SW_CURSOR
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #43 lore raw

PATCH v3 19/29 video: Drop CONFIG_VIDEO_SW_CURSOR

In reply to Simon Glass

Since all boards enable this, we may as well drop the option.

This is a separate patch from the previous one, so it can be skipped if someone identifies a need.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                      |  1 -
 drivers/video/Kconfig       | 10 ----------
 drivers/video/cfb_console.c | 46 ++++++++++++---------------------------------
 3 files changed, 12 insertions(+), 45 deletions(-)

README +0 -1

index 6367fdd..bfb0139 100644
@@ -1674,7 +1674,6 @@ CBFS (Coreboot Filesystem) support
 			CONFIG_VIDEO
 			CONFIG_CMD_BMP
 			CONFIG_CFB_CONSOLE
-			CONFIG_VIDEO_SW_CURSOR
 			CONFIG_VGA_AS_SINGLE_DEVICE
 			CONFIG_VIDEO_LOGO
 			CONFIG_VIDEO_BMP_LOGO

drivers/video/Kconfig +0 ~~-10~~

index 4caa92a..2c5ef2b 100644
@@ -482,16 +482,6 @@ config VGA_AS_SINGLE_DEVICE
 	  may be used if you have no keyboard device, or more than one
 	  (USB Keyboard, AT Keyboard).
 
-config VIDEO_SW_CURSOR
-	bool "Enable a software cursor"
-	depends on CFB_CONSOLE
-	default y if CFB_CONSOLE
-	help
-	  This draws a cursor after the last character. No blinking is
-	  provided. This makes it possible to see the current cursor
-	  position when entering text on the console. It is recommended to
-	  enable this.
-
 config VIDEO_CT69000
 	bool "Enable Chips & Technologies 69000 video driver"
 	depends on VIDEO

drivers/video/cfb_console.c +12 ~~-34~~

100 lines not on this page · raw message

Signature · 1 line

2.8.0.rc3.226.g39d4020

Simon Glass

author

2016-09-29 20:23 UTC #44 lore raw

PATCH v3 20/29 Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_CONSOLE_EXTRA_INFO

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 configs/MIP405T_defconfig            |  1 +
 configs/MIP405_defconfig             |  1 +
 configs/MiniFAP_defconfig            |  1 +
 configs/PIP405_defconfig             |  1 +
 configs/TQM5200_B_HIGHBOOT_defconfig |  1 +
 configs/TQM5200_B_defconfig          |  1 +
 configs/TQM5200_STK100_defconfig     |  1 +
 configs/TQM5200_defconfig            |  1 +
 configs/charon_defconfig             |  1 +
 configs/icon_defconfig               |  1 +
 configs/ipek01_defconfig             |  1 +
 configs/lwmon5_defconfig             |  1 +
 configs/socrates_defconfig           |  1 +
 drivers/video/Kconfig                | 10 ++++++++++
 include/configs/MIP405.h             |  1 -
 include/configs/PIP405.h             |  1 -
 include/configs/TQM5200.h            |  1 -
 include/configs/icon.h               |  1 -
 include/configs/ipek01.h             |  1 -
 include/configs/lwmon5.h             |  1 -
 include/configs/socrates.h           |  1 -
 scripts/config_whitelist.txt         |  1 -
 22 files changed, 23 insertions(+), 8 deletions(-)

configs/MIP405T_defconfig +1 -0

index 81e48dc..ff19c50 100644
@@ -14,4 +14,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_VIDEO_CT69000=y

configs/MIP405_defconfig +1 -0

index df0cd84..be9ba32 100644
@@ -17,4 +17,5 @@ CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_VIDEO_CT69000=y

configs/MiniFAP_defconfig +1 -0

index 31602ab..e426cd1 100644
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/PIP405_defconfig +1 -0

index 4adddea..74c67ac 100644
@@ -17,4 +17,5 @@ CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_VIDEO_CT69000=y

configs/TQM5200_B_HIGHBOOT_defconfig +1 -0

index cdba626..085e4f2 100644
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/TQM5200_B_defconfig +1 -0

index ddd356b..54ae558 100644
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/TQM5200_STK100_defconfig +1 -0

index 541a37a..5ee99e3 100644
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/TQM5200_defconfig +1 -0

index 1d31439..faf5802 100644
@@ -19,4 +19,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/charon_defconfig +1 -0

index a7e60b7..5c8b949 100644
@@ -19,4 +19,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/icon_defconfig +1 -0

index 565a337..669dc2a 100644
@@ -18,4 +18,5 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/ipek01_defconfig +1 -0

index ee36fab..d81d95c 100644
@@ -14,4 +14,5 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/lwmon5_defconfig +1 -0

index a2259b4..0282d28 100644
@@ -21,4 +21,5 @@ CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

configs/socrates_defconfig +1 -0

index 372918f..867db13 100644
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y

drivers/video/Kconfig +10 -0

index 2c5ef2b..5d7e0ff 100644
@@ -482,6 +482,16 @@ config VGA_AS_SINGLE_DEVICE
 	  may be used if you have no keyboard device, or more than one
 	  (USB Keyboard, AT Keyboard).
 
+config CONSOLE_EXTRA_INFO
+	bool "Display additional board information"
+	depends on CFB_CONSOLE
+	help
+	  Display additional board information strings that normally go to
+	  the serial port. When this option is enabled, a board-specific
+	  function video_get_info_str() is called to get the string for
+	  each line of the display. The function should return the string,
+	  which can be empty if there is nothing to display for that line.
+
 config VIDEO_CT69000
 	bool "Enable Chips & Technologies 69000 video driver"
 	depends on VIDEO

include/configs/MIP405.h +0 -1

index 257fa47..43468ef 100644
@@ -343,7 +343,6 @@
  * Video support
  ************************************************************/
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
 #undef CONFIG_VIDEO_ONBOARD
 /************************************************************
  * USB support EXPERIMENTAL

include/configs/PIP405.h +0 -1

index 70e75c1..685922c 100644
@@ -303,7 +303,6 @@
  * Video support
  ************************************************************/
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_VIDEO_ONBOARD		/* Video controller is on-board */
 
 /************************************************************

include/configs/TQM5200.h +0 -1

index 06d2be5..5439ed6 100644
@@ -103,7 +103,6 @@
 #define CONFIG_VIDEO_LOGO
 
 #ifndef CONFIG_FO300
-#define CONFIG_CONSOLE_EXTRA_INFO
 #else
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

include/configs/icon.h +0 -1

index 3a72a66..c60df49 100644
@@ -133,7 +133,6 @@
 #define CONFIG_VIDEO_SM501_PCI
 #define VIDEO_FB_LITTLE_ENDIAN
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CFG_CONSOLE_IS_IN_ENV

include/configs/ipek01.h +0 -1

index 5298376..d53080b 100644
@@ -50,7 +50,6 @@
 #define VIDEO_FB_16BPP_WORD_SWAP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)	/* decompressed img */

include/configs/lwmon5.h +0 -1

index 2e89b1a..2fed3e0 100644
@@ -356,7 +356,6 @@
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP

include/configs/socrates.h +0 -1

index 16e4b02..0ae2b78 100644
@@ -173,7 +173,6 @@
 #define CONFIG_VIDEO_MB862xx_ACCEL
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
 #define CONFIG_SPLASH_SCREEN

scripts/config_whitelist.txt +0 -1

index dd36855..f5c53c8 100644
@@ -672,7 +672,6 @@ CONFIG_COMMON_ENV_SETTINGS
 CONFIG_COMMON_ENV_UBI
 CONFIG_COMPACT_FLASH
 CONFIG_COMPAT
-CONFIG_CONSOLE_EXTRA_INFO
 CONFIG_CONSOLE_INFO_QUIET
 CONFIG_CONSOLE_SCROLL_LINES
 CONFIG_CONS_EXTC_PINSEL

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:15 UTC #45 lore raw

PATCH v3 20/29 Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 25 lines

This converts the following to Kconfig:
CONFIG_CONSOLE_EXTRA_INFO

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

  configs/MIP405T_defconfig            |  1 +
  configs/MIP405_defconfig             |  1 +
  configs/MiniFAP_defconfig            |  1 +
  configs/PIP405_defconfig             |  1 +
  configs/TQM5200_B_HIGHBOOT_defconfig |  1 +
  configs/TQM5200_B_defconfig          |  1 +
  configs/TQM5200_STK100_defconfig     |  1 +
  configs/TQM5200_defconfig            |  1 +
  configs/charon_defconfig             |  1 +
  configs/icon_defconfig               |  1 +
  configs/ipek01_defconfig             |  1 +
  configs/lwmon5_defconfig             |  1 +
  configs/socrates_defconfig           |  1 +
  drivers/video/Kconfig                | 10 ++++++++++
  include/configs/MIP405.h             |  1 -

Quoted 8 lines

  include/configs/PIP405.h             |  1 -
  include/configs/TQM5200.h            |  1 -
  include/configs/icon.h               |  1 -
  include/configs/ipek01.h             |  1 -
  include/configs/lwmon5.h             |  1 -
  include/configs/socrates.h           |  1 -
  scripts/config_whitelist.txt         |  1 -
  22 files changed, 23 insertions(+), 8 deletions(-)

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #46 lore raw

PATCH v3 21/29 video: Move video_get_info_str() prototype to a header file

In reply to Simon Glass

This should be defined in a header file so that arguments are checked. Move it to video.h.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 board/liebherr/lwmon5/lwmon5.c |  1 +
 board/mosaixtech/icon/icon.c   |  1 +
 board/mpl/common/common_util.c |  1 +
 board/tqc/tqm5200/tqm5200.c    |  1 +
 drivers/video/cfb_console.c    | 25 ++++++++-----------------
 include/video.h                | 11 +++++++++++
 6 files changed, 23 insertions(+), 17 deletions(-)

board/liebherr/lwmon5/lwmon5.c +1 -0

index 8ad6712..bb99a3b 100644
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <post.h>
 #include <flash.h>
+#include <video.h>
 #include <mtd/cfi_flash.h>
 
 DECLARE_GLOBAL_DATA_PTR;

board/mosaixtech/icon/icon.c +1 -0

index 1795464..7558234 100644
@@ -11,6 +11,7 @@
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
+#include <video.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/ppc4xx-gpio.h>

board/mpl/common/common_util.c +1 -0

index 3c110fa..a6edb6d 100644
@@ -15,6 +15,7 @@
 #include <pci.h>
 #include <malloc.h>
 #include <bzlib.h>
+#include <video.h>
 
 #ifdef CONFIG_PIP405
 #include "../pip405/pip405.h"

board/tqc/tqm5200/tqm5200.c +1 -0

index 8b82c34..fef9d2b 100644
@@ -18,6 +18,7 @@
 #include <asm/processor.h>
 #include <libfdt.h>
 #include <netdev.h>
+#include <video.h>
 
 #ifdef CONFIG_VIDEO_SM501
 #include <sm501.h>

drivers/video/cfb_console.c +8 ~~-17~~

index c788651..b02a153 100644
@@ -64,6 +64,7 @@
 #include <fdtdec.h>
 #include <version.h>
 #include <malloc.h>
+#include <video.h>
 #include <linux/compiler.h>
 
 /*

@@ -215,16 +216,6 @@
 #endif
 #endif
 
-#ifdef CONFIG_CONSOLE_EXTRA_INFO
-/*
- * setup a board string: type, speed, etc.
- *
- * line_number:	location to place info string beside logo
- * info:	buffer for info string
- */
-extern void video_get_info_str(int line_number,	char *info);
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 /* Locals */

@@ -801,7 +792,7 @@ static void parse_putc(const char c)
 		video_set_cursor();
 }
 
-static void video_putc(struct stdio_dev *dev, const char c)
+static void cfb_video_putc(struct stdio_dev *dev, const char c)
 {
 #ifdef CONFIG_CFB_CONSOLE_ANSI
 	int i;

@@ -1015,7 +1006,7 @@ static void video_putc(struct stdio_dev *dev, const char c)
 		flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
 }
 
-static void video_puts(struct stdio_dev *dev, const char *s)
+static void cfb_video_puts(struct stdio_dev *dev, const char *s)
 {
 	int flush = cfb_do_flush_cache;
 	int count = strlen(s);

@@ -1024,7 +1015,7 @@ static void video_puts(struct stdio_dev *dev, const char *s)
 	cfb_do_flush_cache = 0;
 
 	while (count--)
-		video_putc(dev, *s++);
+		cfb_video_putc(dev, *s++);
 
 	if (flush) {
 		cfb_do_flush_cache = flush;

@@ -1991,7 +1982,7 @@ void video_clear(void)
 #endif
 }
 
-static int video_init(void)
+static int cfg_video_init(void)
 {
 	unsigned char color8;

@@ -2117,7 +2108,7 @@ int drv_video_init(void)
 		return 0;
 
 	/* Init video chip - returns with framebuffer cleared */
-	if (video_init() == -1)
+	if (cfg_video_init() == -1)
 		return 0;
 
 	if (board_cfb_skip())

@@ -2142,8 +2133,8 @@ int drv_video_init(void)
 	memset(&console_dev, 0, sizeof(console_dev));
 	strcpy(console_dev.name, "vga");
 	console_dev.flags = DEV_FLAGS_OUTPUT;
-	console_dev.putc = video_putc;	/* 'putc' function */
-	console_dev.puts = video_puts;	/* 'puts' function */
+	console_dev.putc = cfb_video_putc;	/* 'putc' function */
+	console_dev.puts = cfb_video_puts;	/* 'puts' function */
 
 #if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
 	if (have_keyboard && keyboard_ok) {

include/video.h +11 -0

index 0d5bd21..5b4e78b 100644
@@ -245,6 +245,17 @@ int lg4573_spi_startup(unsigned int bus, unsigned int cs,
 	unsigned int max_hz, unsigned int spi_mode);
 #endif
 
+/*
+ * video_get_info_str() - obtain a board string: type, speed, etc.
+ *
+ * This is called if CONFIG_CONSOLE_EXTRA_INFO is enabled.
+ *
+ * line_number:	location to place info string beside logo
+ * info:	buffer for info string (empty if nothing to display on this
+ * line)
+ */
+void video_get_info_str(int line_number, char *info);
+
 #endif /* CONFIG_DM_VIDEO */
 
 #endif

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:19 UTC #47 lore raw

PATCH v3 21/29 video: Move video_get_info_str() prototype to a header file

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 10 lines

This should be defined in a header file so that arguments are checked. Move it to video.h.
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Quoted 7 lines

  board/liebherr/lwmon5/lwmon5.c |  1 +
  board/mosaixtech/icon/icon.c   |  1 +
  board/mpl/common/common_util.c |  1 +
  board/tqc/tqm5200/tqm5200.c    |  1 +
  drivers/video/cfb_console.c    | 25 ++++++++-----------------
  include/video.h                | 11 +++++++++++
  6 files changed, 23 insertions(+), 17 deletions(-)

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #48 lore raw

PATCH v3 22/29 video: Drop CONFIG_CONSOLE_INFO_QUIET

In reply to Simon Glass

This is not used in U-Boot. Drop it.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 include/configs/edminiv2.h         | 1 -
 include/configs/km/km_arm.h        | 1 -
 include/configs/mv-common.h        | 1 -
 include/configs/mvebu_db-88f3720.h | 1 -
 include/configs/mvebu_db-88f7040.h | 1 -
 scripts/config_whitelist.txt       | 1 -
 6 files changed, 6 deletions(-)

include/configs/edminiv2.h +0 -1

index 982d526..51e17c5 100644
@@ -208,7 +208,6 @@
 /*
  * Other required minimal configurations
  */
-#define CONFIG_CONSOLE_INFO_QUIET	/* some code reduction */
 #define CONFIG_ARCH_CPU_INIT		/* call arch_cpu_init() */
 #define CONFIG_ARCH_MISC_INIT		/* call arch_misc_init() */
 #define CONFIG_DISPLAY_CPUINFO		/* Display cpu info */

include/configs/km/km_arm.h +0 -1

index 25db704..e2fade0 100644
@@ -146,7 +146,6 @@
 /*
  * Other required minimal configurations
  */
-#define CONFIG_CONSOLE_INFO_QUIET	/* some code reduction */
 #define CONFIG_ARCH_CPU_INIT		/* call arch_cpu_init() */
 #define CONFIG_ARCH_MISC_INIT		/* call arch_misc_init() */
 #define CONFIG_DISPLAY_CPUINFO		/* Display cpu info */

include/configs/mv-common.h +0 -1

index ed271c2..a9ac7ff 100644
@@ -83,7 +83,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_CONSOLE_INFO_QUIET	/* some code reduction */
 #define CONFIG_ARCH_CPU_INIT	/* call arch_cpu_init() */
 #define CONFIG_ARCH_MISC_INIT	/* call arch_misc_init() */
 #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */

include/configs/mvebu_db-88f3720.h +0 -1

index e785f24..7a50c4e 100644
@@ -51,7 +51,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_CONSOLE_INFO_QUIET	/* some code reduction */
 #define CONFIG_ARCH_CPU_INIT		/* call arch_cpu_init() */
 #define CONFIG_BOARD_EARLY_INIT_F	/* call board_init_f for early inits */
 #define CONFIG_SYS_LOAD_ADDR	0x00800000	/* default load adr- 8M */

include/configs/mvebu_db-88f7040.h +0 -1

index cfb0191..709098f 100644
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_CONSOLE_INFO_QUIET	/* some code reduction */
 #define CONFIG_ARCH_CPU_INIT		/* call arch_cpu_init() */
 #define CONFIG_BOARD_EARLY_INIT_F	/* call board_init_f for early inits */
 #define CONFIG_SYS_LOAD_ADDR	0x00800000	/* default load adr- 8M */

scripts/config_whitelist.txt +0 -1

index f5c53c8..f87efb3 100644
@@ -672,7 +672,6 @@ CONFIG_COMMON_ENV_SETTINGS
 CONFIG_COMMON_ENV_UBI
 CONFIG_COMPACT_FLASH
 CONFIG_COMPAT
-CONFIG_CONSOLE_INFO_QUIET
 CONFIG_CONSOLE_SCROLL_LINES
 CONFIG_CONS_EXTC_PINSEL
 CONFIG_CONS_EXTC_RATE

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:20 UTC #49 lore raw

PATCH v3 22/29 video: Drop CONFIG_CONSOLE_INFO_QUIET

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 9 lines

This is not used in U-Boot. Drop it.
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Quoted 7 lines

  include/configs/edminiv2.h         | 1 -
  include/configs/km/km_arm.h        | 1 -
  include/configs/mv-common.h        | 1 -
  include/configs/mvebu_db-88f3720.h | 1 -
  include/configs/mvebu_db-88f7040.h | 1 -
  scripts/config_whitelist.txt       | 1 -
  6 files changed, 6 deletions(-)

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #50 lore raw

PATCH v3 23/29 Convert CONFIG_LCD to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_LCD

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

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

configs/TQM823L_LCD_defconfig +2 -1

index 38f5119..9bc8c73 100644
@@ -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

configs/TTTech_defconfig +2 -1

index e545848..9649012 100644
@@ -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

configs/at91sam9261ek_dataflash_cs0_defconfig +1 -0

index 99bb49e..dbe656a 100644
@@ -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

configs/at91sam9261ek_dataflash_cs3_defconfig +1 -0

index 014e50e..98a152e 100644
@@ -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

configs/at91sam9261ek_nandflash_defconfig +1 -0

index e0e8fea..2d4a9af 100644
@@ -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

configs/at91sam9263ek_dataflash_cs0_defconfig +1 -0

index 38b9635..5ec3176 100644
@@ -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

configs/at91sam9263ek_dataflash_defconfig +1 -0

index 38b9635..5ec3176 100644
@@ -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

configs/at91sam9263ek_nandflash_defconfig +1 -0

index 317d9c2..3838f94 100644
@@ -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

configs/at91sam9263ek_norflash_boot_defconfig +1 -0

index a26d7d1..556845a 100644
@@ -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

configs/at91sam9263ek_norflash_defconfig +1 -0

index 8b72678..18b67c9 100644
@@ -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

configs/at91sam9g10ek_dataflash_cs0_defconfig +1 -0

index 0293aa6..eb26ec9 100644
@@ -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

configs/at91sam9g10ek_dataflash_cs3_defconfig +1 -0

index 777d234..c6ccbb5 100644
@@ -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

configs/at91sam9g10ek_nandflash_defconfig +1 -0

index 788e7e1..22fc450 100644
@@ -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

configs/at91sam9m10g45ek_mmc_defconfig +1 -0

index 9604af9..57ea3ca 100644
@@ -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

configs/at91sam9m10g45ek_nandflash_defconfig +1 -0

index e1aebb1..092b7f9 100644
@@ -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

configs/at91sam9n12ek_mmc_defconfig +1 -0

index ce62edf..e46c03e 100644
@@ -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

configs/at91sam9n12ek_nandflash_defconfig +1 -0

index 3b7ebc2..ee98054 100644
@@ -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

configs/at91sam9n12ek_spiflash_defconfig +1 -0

index 26c93af..8db4cbc 100644
@@ -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

configs/at91sam9rlek_dataflash_defconfig +1 -0

index 494a630..8c8f350 100644
@@ -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

configs/at91sam9rlek_mmc_defconfig +1 -0

index f0ea3f0..9140b21 100644
@@ -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

configs/at91sam9rlek_nandflash_defconfig +1 -0

index 0a414e4..08a4639 100644
@@ -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

configs/at91sam9x5ek_dataflash_defconfig +1 -0

index bb47f4a..6cba891 100644
@@ -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

configs/at91sam9x5ek_mmc_defconfig +1 -0

index a7d2c9d..8730d70 100644
@@ -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

configs/at91sam9x5ek_nandflash_defconfig +1 -0

index b482687..5744c62 100644
@@ -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

configs/at91sam9x5ek_spiflash_defconfig +1 -0

index 5446215..7caec2c 100644
@@ -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

configs/brppt1_mmc_defconfig +1 -0

index e990f03..0a3ea12 100644
@@ -45,4 +45,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y

configs/brppt1_nand_defconfig +1 -0

index 8872f4a..0fabecc 100644
@@ -45,4 +45,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y

configs/brppt1_spi_defconfig +1 -0

index c04dde8..09fd2df 100644
@@ -53,4 +53,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y

configs/brxre1_defconfig +1 -0

index 0251088..27cdb62 100644
@@ -44,5 +44,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

configs/cm_t3517_defconfig +1 -0

index b131b27..3bca796 100644
@@ -23,4 +23,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y

configs/cm_t35_defconfig +1 -0

index 9a2f624..0fbc08b 100644
@@ -24,4 +24,5 @@ CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y

configs/peach-pi_defconfig +1 -0

index e5f34a1..df160ae 100644
@@ -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

configs/peach-pit_defconfig +1 -0

index ddcb451..abc23c4 100644
@@ -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

configs/picosam9g45_defconfig +1 -0

index a3a4f5d..5413f09 100644
@@ -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

configs/pm9261_defconfig +1 -0

index 63637e7..b1510cb 100644
@@ -17,3 +17,4 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y

configs/pm9263_defconfig +1 -0

index 7ffde4b..be58975 100644
@@ -17,3 +17,4 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y

configs/rpi_2_defconfig +1 -0

index 69d208d..4a30450 100644
@@ -21,5 +21,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

configs/rpi_3_32b_defconfig +1 -0

index 0e408d2..b622afe 100644
@@ -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

configs/rpi_3_defconfig +1 -0

index 6ad4189..df639aa 100644
@@ -22,5 +22,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

configs/rpi_defconfig +1 -0

index ac1f38e..f0418f0 100644
@@ -21,5 +21,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

configs/sama5d3xek_mmc_defconfig +1 -0

index 8cee4c2..3e72e6a 100644
@@ -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

configs/sama5d3xek_nandflash_defconfig +1 -0

index 8dc5e24..cec7bb2 100644
@@ -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

configs/sama5d3xek_spiflash_defconfig +1 -0

index 019869c..eb60bfe 100644
@@ -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

configs/sama5d4ek_mmc_defconfig +1 -0

index f9c766a..63e9f27 100644
@@ -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

configs/sama5d4ek_nandflash_defconfig +1 -0

index c8456d0..5a6def9 100644
@@ -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

configs/sama5d4ek_spiflash_defconfig +1 -0

index a061c4d..9f87f15 100644
@@ -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

configs/snow_defconfig +1 -0

index a5754f8..c5d8d39 100644
@@ -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

configs/spring_defconfig +1 -0

index 0c394c8..8aab175 100644
@@ -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

configs/wtk_defconfig +2 -1

index 336d8e4..3e4f386 100644
@@ -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

configs/zipitz2_defconfig +1 -0

index a776055..08cd3a0 100644
@@ -14,5 +14,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

drivers/video/Kconfig +8 -0

index 5d7e0ff..2f0d2fb 100644
@@ -541,4 +541,12 @@ config SYS_CONSOLE_FG_COL
 	  the background and foreground to the same colour or you will see
 	  nothing.
 
+config LCD
+	bool "Enable legacy LCD support"
+	help
+	  Define this to enable LCD support (for output to LCD display).
+	  You will also need to select an LCD driver using an additional
+	  CONFIG option. See the README for details. Drives which have been
+	  converted to driver model will instead used CONFIG_DM_VIDEO.
+
 endmenu

include/configs/M52277EVB.h +0 -1

index 898ed7d..6230948 100644
@@ -84,7 +84,6 @@
 
 /* LCD */
 #ifdef CONFIG_CMD_BMP
-#define CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_LCD_LOGO
 #define CONFIG_SHARP_LQ035Q7DH06

include/configs/at91sam9261ek.h +0 -1

index 591c7d4..e940ac0 100644
@@ -49,7 +49,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* LCD */
-#define CONFIG_LCD
 #define LCD_BPP				LCD_COLOR8
 #define CONFIG_LCD_LOGO
 #undef LCD_TEST_PATTERN

include/configs/at91sam9263ek.h +0 -1

index ecc87ea..f8ecc14 100644
@@ -59,7 +59,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* LCD */
-#define CONFIG_LCD			1
 #define LCD_BPP				LCD_COLOR8
 #define CONFIG_LCD_LOGO			1
 #undef LCD_TEST_PATTERN

include/configs/at91sam9m10g45ek.h +0 -1

index e89c19b..2417950 100644
@@ -41,7 +41,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

include/configs/at91sam9n12ek.h +0 -1

index a54e59e..b8f149e 100644
@@ -40,7 +40,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* LCD */
-#define CONFIG_LCD
 #define LCD_BPP				LCD_COLOR16
 #define LCD_OUTPUT_BPP			24
 #define CONFIG_LCD_LOGO

include/configs/at91sam9rlek.h +0 -1

index 1bbfb9e..2211d8a 100644
@@ -46,7 +46,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* LCD */
-#define CONFIG_LCD			1
 #define LCD_BPP				LCD_COLOR8
 #define CONFIG_LCD_LOGO			1
 #undef LCD_TEST_PATTERN

include/configs/at91sam9x5ek.h +0 -1

index 209e6e6..b8d035b 100644
@@ -36,7 +36,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

include/configs/brppt1.h +0 -1

index e01d535..1a76e2f 100644
@@ -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

include/configs/brxre1.h +0 -1

index 1e8426f..b9f69be 100644
@@ -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

include/configs/cm_t35.h +0 -1

index 0cd2f3c..7225c8a 100644
@@ -286,7 +286,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

include/configs/cm_t3517.h +0 -1

index 893d637..07d30bd 100644
@@ -287,7 +287,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

include/configs/exynos5-dt-common.h +0 -1

index 3d81f94..7cb3a29 100644
@@ -27,7 +27,6 @@
 #define CONFIG_BOARD_COMMON
 
 /* Display */
-#define CONFIG_LCD
 #ifdef CONFIG_LCD
 #define CONFIG_EXYNOS_FB
 #define CONFIG_EXYNOS_DP

include/configs/ma5d4evk.h +0 -1

index 8fe5db6..91037d6 100644
@@ -21,7 +21,6 @@
  */
 #define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
-/*#define CONFIG_LCD*/
 
 /*
  * Memory configurations

include/configs/peach-pi.h +0 -1

index b01fe4c..296d77a 100644
@@ -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

include/configs/picosam9g45.h +0 -1

index 8ebf336..c44afa6 100644
@@ -44,7 +44,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

include/configs/pm9261.h +0 -1

index fbb7146..f61f567 100644
@@ -151,7 +151,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

include/configs/pm9263.h +0 -1

index a4672b0..93f30d7 100644
@@ -164,7 +164,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

include/configs/rpi.h +0 -1

index decf35a..4ad98e1 100644
@@ -71,7 +71,6 @@
 /* GPIO */
 #define CONFIG_BCM2835_GPIO
 /* LCD */
-#define CONFIG_LCD
 #define CONFIG_LCD_DT_SIMPLEFB
 #define LCD_BPP				LCD_COLOR16
 /*

include/configs/sama5d2_xplained.h +0 -1

index c20d6f9..30fb9a4 100644
@@ -86,7 +86,6 @@
 #define CONFIG_MACB_SEARCH_PHY
 
 /* LCD */
-/* #define CONFIG_LCD */
 
 #ifdef CONFIG_LCD
 #define LCD_BPP				LCD_COLOR16

include/configs/sama5d3xek.h +0 -1

index c149e5b..1b053a6 100644
@@ -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

include/configs/sama5d4_xplained.h +0 -1

index 0890cf5..249e661 100644
@@ -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

include/configs/sama5d4ek.h +0 -1

index 36da48c..00ed400 100644
@@ -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

include/configs/smdk5250.h +0 -1

index 5c60887..c152459 100644
@@ -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

include/configs/smdk5420.h +0 -1

index d8d095f..502772c 100644
@@ -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

include/configs/zipitz2.h +0 -1

index 6e83cc9..ed2c9ac 100644
@@ -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

scripts/config_whitelist.txt +0 -1

index f87efb3..09ec741 100644
@@ -1885,7 +1885,6 @@ CONFIG_LAYERSCAPE_NS_ACCESS
 CONFIG_LBA48
 CONFIG_LBD
 CONFIG_LBDAF
-CONFIG_LCD
 CONFIG_LCD_ALIGNMENT
 CONFIG_LCD_BMP_RLE8
 CONFIG_LCD_DT_SIMPLEFB

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:21 UTC #51 lore raw

PATCH v3 23/29 Convert CONFIG_LCD to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 9 lines

This converts the following to Kconfig:
CONFIG_LCD
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #52 lore raw

PATCH v3 24/29 Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_CONSOLE_SCROLL_LINES

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                                                  |  6 ------
 configs/bayleybay_defconfig                             |  1 +
 configs/chromebook_jerry_defconfig                      |  1 +
 configs/chromebook_link_defconfig                       |  1 +
 configs/chromebook_samus_defconfig                      |  1 +
 configs/chromebox_panther_defconfig                     |  1 +
 configs/colibri_t20_defconfig                           |  1 +
 configs/conga-qeval20-qa3-e3845-internal-uart_defconfig |  1 +
 configs/conga-qeval20-qa3-e3845_defconfig               |  1 +
 configs/coreboot-x86_defconfig                          |  1 +
 configs/crownbay_defconfig                              |  1 +
 configs/dfi-bt700-q7x-151_defconfig                     |  1 +
 configs/firefly-rk3288_defconfig                        |  1 +
 configs/harmony_defconfig                               |  1 +
 configs/minnowmax_defconfig                             |  1 +
 configs/paz00_defconfig                                 |  1 +
 configs/qemu-x86_defconfig                              |  1 +
 configs/qemu-x86_efi_payload32_defconfig                |  1 +
 configs/qemu-x86_efi_payload64_defconfig                |  1 +
 configs/rock2_defconfig                                 |  1 +
 configs/seaboard_defconfig                              |  1 +
 configs/som-db5800-som-6867_defconfig                   |  1 +
 configs/theadorable-x86-dfi-bt700_defconfig             |  1 +
 configs/ventana_defconfig                               |  1 +
 drivers/video/Kconfig                                   | 10 ++++++++++
 include/configs/chromebook_jerry.h                      |  1 -
 include/configs/colibri_pxa270.h                        |  1 -
 include/configs/colibri_t20.h                           |  1 -
 include/configs/evb_rk3288.h                            |  1 -
 include/configs/evb_rk3399.h                            |  1 -
 include/configs/fennec_rk3288.h                         |  1 -
 include/configs/firefly-rk3288.h                        |  1 -
 include/configs/harmony.h                               |  1 -
 include/configs/miniarm_rk3288.h                        |  1 -
 include/configs/paz00.h                                 |  1 -
 include/configs/popmetal_rk3288.h                       |  1 -
 include/configs/rock2.h                                 |  1 -
 include/configs/rpi.h                                   |  1 -
 include/configs/seaboard.h                              |  1 -
 include/configs/ventana.h                               |  1 -
 include/configs/x86-common.h                            |  1 -
 include/lcd_console.h                                   |  3 ---
 scripts/config_whitelist.txt                            |  1 -
 43 files changed, 33 insertions(+), 26 deletions(-)

README +0 -6

index bfb0139..e9ed9bb 100644
@@ -1743,12 +1743,6 @@ CBFS (Coreboot Filesystem) support
 		here, since it is cheaper to change data cache settings on
 		a per-section basis.
 
-		CONFIG_CONSOLE_SCROLL_LINES
-
-		When the console need to be scrolled, this is the number of
-		lines to scroll by. It defaults to 1. Increasing this makes
-		the console jump but can help speed up operation when scrolling
-		is slow.
 
 		CONFIG_LCD_ROTATION

configs/bayleybay_defconfig +1 -0

index 6de6c1e..e6d8418c 100644
@@ -59,4 +59,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/chromebook_jerry_defconfig +1 -0

index 9677e60..a5809ac 100644
@@ -78,6 +78,7 @@ CONFIG_SYSRESET=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y

configs/chromebook_link_defconfig +1 -0

index 2f35b77..7922fcc 100644
@@ -63,5 +63,6 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

configs/chromebook_samus_defconfig +1 -0

index 1822970..7e9857e 100644
@@ -60,5 +60,6 @@ CONFIG_DM_VIDEO=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_VIDEO_BROADWELL_IGD=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

configs/chromebox_panther_defconfig +1 -0

index 0d5aaa7..acc1038 100644
@@ -55,5 +55,6 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

configs/colibri_t20_defconfig +1 -0

index 2745d8b..f4ea6e3 100644
@@ -52,3 +52,4 @@ CONFIG_G_DNL_VENDOR_NUM=0x0955
 CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10

configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0

index 513f3c4..7cb935e 100644
@@ -67,4 +67,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/conga-qeval20-qa3-e3845_defconfig +1 -0

index cc6385b..9209ed0 100644
@@ -66,4 +66,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/coreboot-x86_defconfig +1 -0

index 693302c..f640c5a 100644
@@ -42,5 +42,6 @@ CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

configs/crownbay_defconfig +1 -0

index a1587ef..0ec3851 100644
@@ -52,4 +52,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/dfi-bt700-q7x-151_defconfig +1 -0

index 3c6b94f..414c615 100644
@@ -64,4 +64,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/firefly-rk3288_defconfig +1 -0

index f640fce..b9ebc0f 100644
@@ -67,6 +67,7 @@ CONFIG_SYSRESET=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y

configs/harmony_defconfig +1 -0

index 4fbca28..54490c3 100644
@@ -39,3 +39,4 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10

configs/minnowmax_defconfig +1 -0

index 65da516..ebfcab7 100644
@@ -63,4 +63,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/paz00_defconfig +1 -0

index b86f76c..f2a3c5c 100644
@@ -37,3 +37,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10

configs/qemu-x86_defconfig +1 -0

index 9bd9c1d..3acdaeb 100644
@@ -50,4 +50,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/qemu-x86_efi_payload32_defconfig +1 -0

index 9374dde..13b1fef 100644
@@ -47,6 +47,7 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y

configs/qemu-x86_efi_payload64_defconfig +1 -0

index 85dc3e9..8d48afa 100644
@@ -47,6 +47,7 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y

configs/rock2_defconfig +1 -0

index 5ba7769..f8cebd2 100644
@@ -63,6 +63,7 @@ CONFIG_SYSRESET=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y

configs/seaboard_defconfig +1 -0

index 806caca..230c4b8 100644
@@ -40,3 +40,4 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10

configs/som-db5800-som-6867_defconfig +1 -0

index bbdcbc0..ba97a8e 100644
@@ -61,4 +61,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/theadorable-x86-dfi-bt700_defconfig +1 -0

index 44f7b7c..446ce7a 100644
@@ -61,4 +61,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/ventana_defconfig +1 -0

index 56e7ba3..aac1818 100644
@@ -39,3 +39,4 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10

drivers/video/Kconfig +10 -0

index 2f0d2fb..7bb8441 100644
@@ -492,6 +492,16 @@ config CONSOLE_EXTRA_INFO
 	  each line of the display. The function should return the string,
 	  which can be empty if there is nothing to display for that line.
 
+config CONSOLE_SCROLL_LINES
+	int "Number of lines to scroll the console by"
+	depends on CFB_CONSOLE || DM_VIDEO || LCD
+	default 1
+	help
+	  When the console need to be scrolled, this is the number of
+	  lines to scroll by. It defaults to 1. Increasing this makes the
+	  console jump but can help speed up operation when scrolling
+	  is slow.
+
 config VIDEO_CT69000
 	bool "Enable Chips & Technologies 69000 video driver"
 	depends on VIDEO

include/configs/chromebook_jerry.h +0 -1

index 180527a..b15cc26 100644
@@ -23,6 +23,5 @@
 #define CONFIG_KEYBOARD
 
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif

include/configs/colibri_pxa270.h +0 -1

index ba8d93c..429f571 100644
@@ -67,7 +67,6 @@
 #define CONFIG_PXA_LCD
 #define CONFIG_PXA_VGA
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES	10
 #define CONFIG_CMD_BMP
 #define CONFIG_LCD_LOGO
 #endif

include/configs/colibri_t20.h +0 -1

index b299e15..4634989 100644
@@ -47,7 +47,6 @@
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES	10
 #define CONFIG_CMD_BMP
 #define CONFIG_LCD_LOGO

include/configs/evb_rk3288.h +0 -1

index 390c243..77b647e 100644
@@ -19,6 +19,5 @@
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif

include/configs/evb_rk3399.h +0 -1

index 047850a..f453640 100644
@@ -21,6 +21,5 @@
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif

include/configs/fennec_rk3288.h +0 -1

index 390c243..77b647e 100644
@@ -19,6 +19,5 @@
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif

include/configs/firefly-rk3288.h +0 -1

index ee924c3..14fdead 100644
@@ -23,6 +23,5 @@
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif

include/configs/harmony.h +0 -1

index 2ecae65..3d6b5fc 100644
@@ -54,7 +54,6 @@
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES	10
 
 #include "tegra-common-post.h"

include/configs/miniarm_rk3288.h +0 -1

index 390c243..77b647e 100644
@@ -19,6 +19,5 @@
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif

include/configs/paz00.h +0 -1

index 5e59ccb..a8bb3ff 100644
@@ -45,7 +45,6 @@
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES	10
 
 #include "tegra-common-post.h"

include/configs/popmetal_rk3288.h +0 -1

index 390c243..77b647e 100644
@@ -19,6 +19,5 @@
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif

include/configs/rock2.h +0 -1

index ee924c3..14fdead 100644
@@ -23,6 +23,5 @@
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif

include/configs/rpi.h +0 -1

index 4ad98e1..7fe469c 100644
@@ -81,7 +81,6 @@
 #define CONFIG_FB_ADDR			0
 #define CONFIG_VIDEO_BCM2835
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES	10
 
 /* SD/MMC configuration */
 #define CONFIG_GENERIC_MMC

include/configs/seaboard.h +0 -1

index 3076ef4..fe68437 100644
@@ -61,7 +61,6 @@
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES	10
 
 /* NAND support */
 #define CONFIG_CMD_NAND

include/configs/ventana.h +0 -1

index b282467..d3843d4 100644
@@ -46,7 +46,6 @@
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES	10
 
 #include "tegra-common-post.h"

include/configs/x86-common.h +0 -1

index 352de68..ebb257b 100644
@@ -130,7 +130,6 @@
  * Video Configuration
  */
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_CONSOLE_SCROLL_LINES 5
 
 /*-----------------------------------------------------------------------
  * CPU Features

include/lcd_console.h +0 -3

index 2e0f56f..eac227f 100644
@@ -5,9 +5,6 @@
  */
 
 /* By default we scroll by a single line */
-#ifndef CONFIG_CONSOLE_SCROLL_LINES
-#define CONFIG_CONSOLE_SCROLL_LINES 1
-#endif
 
 struct console_t {
 	short curr_col, curr_row;

scripts/config_whitelist.txt +0 -1

index 09ec741..eab3969 100644
@@ -672,7 +672,6 @@ CONFIG_COMMON_ENV_SETTINGS
 CONFIG_COMMON_ENV_UBI
 CONFIG_COMPACT_FLASH
 CONFIG_COMPAT
-CONFIG_CONSOLE_SCROLL_LINES
 CONFIG_CONS_EXTC_PINSEL
 CONFIG_CONS_EXTC_RATE
 CONFIG_CONS_NONE

Signature · 1 line

2.8.0.rc3.226.g39d4020

Simon Glass

author

2016-09-29 20:23 UTC #53 lore raw

PATCH v3 25/29 Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_ENV_OVERWRITE

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                                 | 3 ---
 common/Kconfig                         | 9 +++++++++
 configs/socfpga_arria5_defconfig       | 1 +
 configs/socfpga_cyclone5_defconfig     | 1 +
 configs/socfpga_de0_nano_soc_defconfig | 1 +
 configs/socfpga_is1_defconfig          | 1 +
 configs/socfpga_mcvevk_defconfig       | 1 +
 configs/socfpga_sockit_defconfig       | 1 +
 configs/socfpga_socrates_defconfig     | 1 +
 configs/socfpga_sr1500_defconfig       | 1 +
 configs/socfpga_vining_fpga_defconfig  | 1 +
 include/configs/MIP405.h               | 1 -
 include/configs/MigoR.h                | 1 -
 include/configs/PIP405.h               | 1 -
 include/configs/ap325rxa.h             | 1 -
 include/configs/ap_sh4a_4a.h           | 1 -
 include/configs/armadillo-800eva.h     | 1 -
 include/configs/ecovec.h               | 1 -
 include/configs/kzm9g.h                | 1 -
 include/configs/ms7722se.h             | 1 -
 include/configs/r0p7734.h              | 1 -
 include/configs/rcar-gen2-common.h     | 1 -
 include/configs/rcar-gen3-common.h     | 1 -
 include/configs/sh7752evb.h            | 1 -
 include/configs/sh7753evb.h            | 1 -
 include/configs/sh7757lcr.h            | 1 -
 include/configs/sh7785lcr.h            | 1 -
 include/configs/socfpga_common.h       | 1 -
 scripts/config_whitelist.txt           | 1 -
 29 files changed, 18 insertions(+), 21 deletions(-)

README +0 -3

index e9ed9bb..7091429 100644
@@ -3588,9 +3588,6 @@ Configuration Settings:
 - CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 		Enable the call to overwrite_console().
 
-- CONFIG_SYS_CONSOLE_ENV_OVERWRITE
-		Enable overwrite of previous console environment settings.
-
 - CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
 		Begin and End addresses of the area used by the
 		simple memory test.

common/Kconfig +9 -0

index 0a417c9..5c0441b 100644
@@ -309,6 +309,15 @@ config SYS_CONSOLE_IS_IN_ENV
 	  environment variables can be updated after boot to change the
 	  input/output devices.
 
+config SYS_CONSOLE_ENV_OVERWRITE
+	bool "Update environment variables during console init"
+	help
+	  The console environment variables (stdout, stdin, stderr) can be
+	  used to determine the correct console devices on start-up. This
+	  option writes the console devices to these variables on console
+	  start-up (after relocation). This causes the environment to be
+	  updated to match the console devices actually chosen.
+
 endmenu
 
 config SYS_NO_FLASH

configs/socfpga_arria5_defconfig +1 -0

index 6fd0354..d896861 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y

configs/socfpga_cyclone5_defconfig +1 -0

index c345faf..c6f7fd4 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y

configs/socfpga_de0_nano_soc_defconfig +1 -0

index e880e01..32ba494 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y

configs/socfpga_is1_defconfig +1 -0

index 671423a..a683b2d 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y

configs/socfpga_mcvevk_defconfig +1 -0

index 13903f7..6dc4b10 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y

configs/socfpga_sockit_defconfig +1 -0

index 920084d..eb6304a 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y

configs/socfpga_socrates_defconfig +1 -0

index 0894cce..6a8becc 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y

configs/socfpga_sr1500_defconfig +1 -0

index 9db5493..5296c78 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y

configs/socfpga_vining_fpga_defconfig +1 -0

index faa05e5..eedf750 100644
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y

include/configs/MIP405.h +0 -1

index 43468ef..8ad34b1 100644
@@ -114,7 +114,6 @@
  * defines if the overwrite_console should be stored in the
  * environment
  **************************************************************/
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 /**************************************************************
  * loads config

include/configs/MigoR.h +0 -1

index a4eabe5..588ddd4 100644
@@ -43,7 +43,6 @@
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress display of console
 								   information at boot */
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(MIGO_R_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/PIP405.h +0 -1

index 685922c..b77aacb 100644
@@ -110,7 +110,6 @@
  * defines if the overwrite_console should be stored in the
  * environment
  **************************************************************/
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 /**************************************************************
  * loads config

include/configs/ap325rxa.h +0 -1

index 32acb08..795a7d2 100644
@@ -57,7 +57,6 @@
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(AP325RXA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/ap_sh4a_4a.h +0 -1

index d41b624..fc08d7b 100644
@@ -73,7 +73,6 @@
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/armadillo-800eva.h +0 -1

index e3f4a7b..175a124 100644
@@ -62,7 +62,6 @@
 #define	CONFIG_SCIF_A
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef	CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(ARMADILLO_800EVA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/ecovec.h +0 -1

index c8508ff..8ab26e6 100644
@@ -93,7 +93,6 @@
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/kzm9g.h +0 -1

index 409c30d..921474f 100644
@@ -58,7 +58,6 @@
 #define CONFIG_CONS_SCIF4
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(KZM_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END \

include/configs/ms7722se.h +0 -1

index 9b0c166..d0b6e58 100644
@@ -42,7 +42,6 @@
 #define CONFIG_CONS_SCIF0	1
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET			/* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(MS7722SE_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/r0p7734.h +0 -1

index 2d7e326..408ae21 100644
@@ -78,7 +78,6 @@
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/rcar-gen2-common.h +0 -1

index 5733da6..ccd5026 100644
@@ -44,7 +44,6 @@
 /* console */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE		256

include/configs/rcar-gen3-common.h +0 -1

index 7655417..a435708 100644
@@ -52,7 +52,6 @@
 /* console */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE		256

include/configs/sh7752evb.h +0 -1

index cfcde81..fd32ddc 100644
@@ -46,7 +46,6 @@
 #define CONFIG_CONS_SCIF2	1
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef	CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(SH7752EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7753evb.h +0 -1

index fefdbb4..57c8e76 100644
@@ -46,7 +46,6 @@
 #define CONFIG_CONS_SCIF2	1
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef	CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(SH7753EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7757lcr.h +0 -1

index 262d390..cb09a7c 100644
@@ -46,7 +46,6 @@
 #define CONFIG_CONS_SCIF2	1
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef	CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(SH7757LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7785lcr.h +0 -1

index 80e61a4..6eee51e 100644
@@ -62,7 +62,6 @@
 #define CONFIG_SCIF_EXT_CLOCK	1
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef	CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START	(SH7785LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/socfpga_common.h +0 -1

index 39dcd51..386c891 100644
@@ -253,7 +253,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * U-Boot environment
  */
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 #if !defined(CONFIG_ENV_SIZE)
 #define CONFIG_ENV_SIZE			4096
 #endif

scripts/config_whitelist.txt +0 -1

index eab3969..c0fcd65 100644
@@ -4610,7 +4610,6 @@ CONFIG_SYS_CMXFCR_VALUE1
 CONFIG_SYS_CMXFCR_VALUE2
 CONFIG_SYS_CMXFCR_VALUE3
 CONFIG_SYS_CMXSCR_VALUE
-CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 CONFIG_SYS_CONSOLE_INFO_QUIET
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 CONFIG_SYS_CORE_SRAM

Signature · 1 line

2.8.0.rc3.226.g39d4020

Simon Glass

author

2016-09-29 20:23 UTC #54 lore raw

PATCH v3 26/29 Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 README                                 | 3 ---
 common/Kconfig                         | 9 +++++++++
 configs/MIP405T_defconfig              | 1 +
 configs/MIP405_defconfig               | 1 +
 configs/PIP405_defconfig               | 1 +
 configs/aristainetos2_defconfig        | 1 +
 configs/aristainetos2b_defconfig       | 1 +
 configs/aristainetos_defconfig         | 1 +
 configs/brppt1_mmc_defconfig           | 1 +
 configs/brppt1_nand_defconfig          | 1 +
 configs/brppt1_spi_defconfig           | 1 +
 configs/brxre1_defconfig               | 1 +
 configs/cgtqmx6eval_defconfig          | 1 +
 configs/dms-ba16-1g_defconfig          | 1 +
 configs/dms-ba16_defconfig             | 1 +
 configs/ea20_defconfig                 | 1 +
 configs/ge_b450v3_defconfig            | 1 +
 configs/ge_b650v3_defconfig            | 1 +
 configs/ge_b850v3_defconfig            | 1 +
 configs/marsboard_defconfig            | 1 +
 configs/mx51evk_defconfig              | 1 +
 configs/mx53loco_defconfig             | 1 +
 configs/mx6dlsabreauto_defconfig       | 1 +
 configs/mx6dlsabresd_defconfig         | 1 +
 configs/mx6qpsabreauto_defconfig       | 1 +
 configs/mx6qsabreauto_defconfig        | 1 +
 configs/mx6qsabrelite_defconfig        | 1 +
 configs/mx6qsabresd_defconfig          | 1 +
 configs/mx6sabresd_spl_defconfig       | 1 +
 configs/nitrogen6dl2g_defconfig        | 1 +
 configs/nitrogen6dl_defconfig          | 1 +
 configs/nitrogen6q2g_defconfig         | 1 +
 configs/nitrogen6q_defconfig           | 1 +
 configs/nitrogen6s1g_defconfig         | 1 +
 configs/nitrogen6s_defconfig           | 1 +
 configs/riotboard_defconfig            | 1 +
 configs/socfpga_arria5_defconfig       | 1 +
 configs/socfpga_cyclone5_defconfig     | 1 +
 configs/socfpga_de0_nano_soc_defconfig | 1 +
 configs/socfpga_is1_defconfig          | 1 +
 configs/socfpga_mcvevk_defconfig       | 1 +
 configs/socfpga_sockit_defconfig       | 1 +
 configs/socfpga_socrates_defconfig     | 1 +
 configs/socfpga_sr1500_defconfig       | 1 +
 configs/socfpga_vining_fpga_defconfig  | 1 +
 configs/wandboard_defconfig            | 1 +
 include/configs/MIP405.h               | 1 -
 include/configs/MigoR.h                | 1 -
 include/configs/PIP405.h               | 1 -
 include/configs/advantech_dms-ba16.h   | 1 -
 include/configs/ap325rxa.h             | 1 -
 include/configs/ap_sh4a_4a.h           | 1 -
 include/configs/aristainetos-common.h  | 1 -
 include/configs/armadillo-800eva.h     | 1 -
 include/configs/bur_cfg_common.h       | 1 -
 include/configs/cgtqmx6eval.h          | 1 -
 include/configs/ea20.h                 | 1 -
 include/configs/ecovec.h               | 1 -
 include/configs/embestmx6boards.h      | 1 -
 include/configs/ge_bx50v3.h            | 2 --
 include/configs/kzm9g.h                | 1 -
 include/configs/ms7722se.h             | 1 -
 include/configs/mx51evk.h              | 1 -
 include/configs/mx53loco.h             | 1 -
 include/configs/mx6sabre_common.h      | 1 -
 include/configs/nitrogen6x.h           | 1 -
 include/configs/r0p7734.h              | 1 -
 include/configs/rcar-gen2-common.h     | 1 -
 include/configs/rcar-gen3-common.h     | 1 -
 include/configs/sh7752evb.h            | 1 -
 include/configs/sh7753evb.h            | 1 -
 include/configs/sh7757lcr.h            | 1 -
 include/configs/sh7785lcr.h            | 1 -
 include/configs/socfpga_common.h       | 1 -
 include/configs/wandboard.h            | 1 -
 scripts/config_whitelist.txt           | 1 -
 76 files changed, 53 insertions(+), 34 deletions(-)

README +0 -3

index 7091429..2342484 100644
@@ -3585,9 +3585,6 @@ Configuration Settings:
 - CONFIG_SYS_CONSOLE_INFO_QUIET
 		Suppress display of console information at boot.
 
-- CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-		Enable the call to overwrite_console().
-
 - CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
 		Begin and End addresses of the area used by the
 		simple memory test.

common/Kconfig +9 -0

index 5c0441b..46e93a9 100644
@@ -309,6 +309,15 @@ config SYS_CONSOLE_IS_IN_ENV
 	  environment variables can be updated after boot to change the
 	  input/output devices.
 
+config SYS_CONSOLE_OVERWRITE_ROUTINE
+	bool "Allow board control over console overwriting"
+	help
+	  If this is enabled, and the board-specific function
+	  overwrite_console() returns 1, the stdin, stderr and stdout are
+	  switched to the serial port, else the settings in the environment
+	  are used. If this is not enabled, the console will not be switched
+	  to serial.
+
 config SYS_CONSOLE_ENV_OVERWRITE
 	bool "Update environment variables during console init"
 	help

configs/MIP405T_defconfig +1 -0

index ff19c50..b3a11ce 100644
@@ -5,6 +5,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_MIP405T=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set

configs/MIP405_defconfig +1 -0

index be9ba32..59f77d6 100644
@@ -5,6 +5,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y

configs/PIP405_defconfig +1 -0

index 74c67ac..f0ca08b 100644
@@ -5,6 +5,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_PIP405=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y

configs/aristainetos2_defconfig +1 -0

index b7443d9..dbb5374 100644
@@ -6,6 +6,7 @@ CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/aristainetos2b_defconfig +1 -0

index d365606..66e3985 100644
@@ -6,6 +6,7 @@ CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/aristainetos_defconfig +1 -0

index a1d2c4e..7e68d48 100644
@@ -6,6 +6,7 @@ CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/brppt1_mmc_defconfig +1 -0

index 0a3ea12..6a349ea 100644
@@ -13,6 +13,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 CONFIG_BOOTDELAY=-2
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/brppt1_nand_defconfig +1 -0

index 0fabecc..eec3848 100644
@@ -13,6 +13,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_BOOTDELAY=-2
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/brppt1_spi_defconfig +1 -0

index 09fd2df..07f7d35 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=-2
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/brxre1_defconfig +1 -0

index 27cdb62..4851003 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_BOOTDELAY=-2
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/cgtqmx6eval_defconfig +1 -0

index 85080b6..3499914 100644
@@ -16,6 +16,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "

configs/dms-ba16-1g_defconfig +1 -0

index f0dcb1d..3236788 100644
@@ -5,6 +5,7 @@ CONFIG_SYS_DDR_1G=y
 CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/dms-ba16_defconfig +1 -0

index 468b3a7..2c14ce5 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_ADVANTECH_DMS_BA16=y
 CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/ea20_defconfig +1 -0

index 13411c6..b70b421 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_EA20=y
 CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ea20 > "

configs/ge_b450v3_defconfig +1 -0

index 29010f3..117f68d 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B450V3=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/ge_b650v3_defconfig +1 -0

index e0eeb46..73b559b 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B650V3=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/ge_b850v3_defconfig +1 -0

index 9b4b917..80d5315 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B850V3=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/marsboard_defconfig +1 -0

index bc76dfd..4104164 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx51evk_defconfig +1 -0

index 02cbf57..4bba151 100644
@@ -4,6 +4,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx53loco_defconfig +1 -0

index f42758e..3422ccb 100644
@@ -4,6 +4,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx6dlsabreauto_defconfig +1 -0

index 68c1a6b..49c2161 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx6dlsabresd_defconfig +1 -0

index 1dbfe53..b380342 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx6qpsabreauto_defconfig +1 -0

index 1445b75..a523632 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx6qsabreauto_defconfig +1 -0

index 004206b..c7e1f4f 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx6qsabrelite_defconfig +1 -0

index 3dab823..d4e3c3d 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
 CONFIG_BOOTDELAY=3
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx6qsabresd_defconfig +1 -0

index 0f3cc7a..e377284 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/mx6sabresd_spl_defconfig +1 -0

index 6d58495..147d2b3 100644
@@ -14,6 +14,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

configs/nitrogen6dl2g_defconfig +1 -0

index d1be7b5..33c6da7 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/nitrogen6dl_defconfig +1 -0

index 6212755..a39e502 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/nitrogen6q2g_defconfig +1 -0

index d05608e..7dacaeb 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/nitrogen6q_defconfig +1 -0

index 452a16c..63ceb01 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/nitrogen6s1g_defconfig +1 -0

index 158df5d..094fe5a 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/nitrogen6s_defconfig +1 -0

index fb8fa4c..ad58fa4 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
 CONFIG_BOOTDELAY=3
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/riotboard_defconfig +1 -0

index 9ad02e4..22ebf5c 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

configs/socfpga_arria5_defconfig +1 -0

index d896861..f4945d1 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/socfpga_cyclone5_defconfig +1 -0

index c6f7fd4..eeee9a0 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/socfpga_de0_nano_soc_defconfig +1 -0

index 32ba494..c303e3a 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/socfpga_is1_defconfig +1 -0

index a683b2d..faa3cb1 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/socfpga_mcvevk_defconfig +1 -0

index 6dc4b10..43bb85c 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/socfpga_sockit_defconfig +1 -0

index eb6304a..8c11ae8 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/socfpga_socrates_defconfig +1 -0

index 6a8becc..4d50971 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/socfpga_sr1500_defconfig +1 -0

index 5296c78..15d9d9b 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/socfpga_vining_fpga_defconfig +1 -0

index eedf750..c8e1c3b 100644
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y

configs/wandboard_defconfig +1 -0

index 329d5e4..affaa5f 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

include/configs/MIP405.h +0 -1

index 8ad34b1..1a4d602 100644
@@ -108,7 +108,6 @@
 /***************************************************************
  * defines if an overwrite_console function exists
  *************************************************************/
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 /***************************************************************
  * defines if the overwrite_console should be stored in the

include/configs/MigoR.h +0 -1

index 588ddd4..b31d51b 100644
@@ -42,7 +42,6 @@
 #define CONFIG_CONS_SCIF0	1
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress display of console
 								   information at boot */
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(MIGO_R_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/PIP405.h +0 -1

index b77aacb..5f7706df 100644
@@ -104,7 +104,6 @@
 /***************************************************************
  * defines if an overwrite_console function exists
  *************************************************************/
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 /***************************************************************
  * defines if the overwrite_console should be stored in the

include/configs/advantech_dms-ba16.h +0 -1

index 2cbbac2..bbf97c7 100644
@@ -276,7 +276,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

include/configs/ap325rxa.h +0 -1

index 795a7d2..153d162 100644
@@ -56,7 +56,6 @@
 
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(AP325RXA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/ap_sh4a_4a.h +0 -1

index fc08d7b..e922cdf 100644
@@ -72,7 +72,6 @@
 
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/aristainetos-common.h +0 -1

index 93083fc..56530fd 100644
@@ -231,7 +231,6 @@
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 /* check this console not needed, after test remove it */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

include/configs/armadillo-800eva.h +0 -1

index 175a124..e6761c3 100644
@@ -61,7 +61,6 @@
 #define SCIF4_BASE		0xe6c80000
 #define	CONFIG_SCIF_A
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(ARMADILLO_800EVA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/bur_cfg_common.h +0 -1

index 277f36e..16237e6 100644
@@ -41,7 +41,6 @@
 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* As stated above, the following choices are optional. */
 #define CONFIG_SYS_LONGHELP

include/configs/cgtqmx6eval.h +0 -1

index b016f20..d474bc1 100644
@@ -89,7 +89,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

include/configs/ea20.h +0 -1

index 8c35688..e3fdc5e 100644
@@ -108,7 +108,6 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CMD_BMP
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #endif
 
 /*

include/configs/ecovec.h +0 -1

index 8ab26e6..dd925a9 100644
@@ -92,7 +92,6 @@
 
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/embestmx6boards.h +0 -1

index 9e0c945..2106e86 100644
@@ -118,7 +118,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

include/configs/ge_bx50v3.h +0 -2

index c1053f8..a3c2bd4 100644
@@ -302,8 +302,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-
 /* Framebuffer */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3

include/configs/kzm9g.h +0 -1

index 921474f..0aff6e8 100644
@@ -57,7 +57,6 @@
 #define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF4
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(KZM_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END \

include/configs/ms7722se.h +0 -1

index d0b6e58..17485b5 100644
@@ -41,7 +41,6 @@
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET			/* Suppress display of console information at boot */
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(MS7722SE_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/mx51evk.h +0 -1

index 968662d..fda8bfe 100644
@@ -97,7 +97,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP

include/configs/mx53loco.h +0 -1

index 258a856..5628943 100644
@@ -216,7 +216,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP

include/configs/mx6sabre_common.h +0 -1

index 9a0b0a2..e404d5b 100644
@@ -209,7 +209,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

include/configs/nitrogen6x.h +0 -1

index 63ef4e7..b32e49e 100644
@@ -93,7 +93,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

include/configs/r0p7734.h +0 -1

index 408ae21..d7ecdb8 100644
@@ -77,7 +77,6 @@
 
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/rcar-gen2-common.h +0 -1

index ccd5026..e02e2d1 100644
@@ -43,7 +43,6 @@
 
 /* console */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE		256

include/configs/rcar-gen3-common.h +0 -1

index a435708..a397e64 100644
@@ -51,7 +51,6 @@
 
 /* console */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE		256

include/configs/sh7752evb.h +0 -1

index fd32ddc..bdb8101 100644
@@ -45,7 +45,6 @@
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(SH7752EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7753evb.h +0 -1

index 57c8e76..eaa862c 100644
@@ -45,7 +45,6 @@
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(SH7753EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7757lcr.h +0 -1

index cb09a7c..8e4ff1c 100644
@@ -45,7 +45,6 @@
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(SH7757LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7785lcr.h +0 -1

index 6eee51e..86057c1 100644
@@ -61,7 +61,6 @@
 #define CONFIG_CONS_SCIF1	1
 #define CONFIG_SCIF_EXT_CLOCK	1
 #undef	CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START	(SH7785LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/socfpga_common.h +0 -1

index 386c891..028743b 100644
@@ -252,7 +252,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 /*
  * U-Boot environment
  */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #if !defined(CONFIG_ENV_SIZE)
 #define CONFIG_ENV_SIZE			4096
 #endif

include/configs/wandboard.h +0 -1

index 4d219e2..84e08e8 100644
@@ -75,7 +75,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

scripts/config_whitelist.txt +0 -1

index c0fcd65..f4b353a 100644
@@ -4611,7 +4611,6 @@ CONFIG_SYS_CMXFCR_VALUE2
 CONFIG_SYS_CMXFCR_VALUE3
 CONFIG_SYS_CMXSCR_VALUE
 CONFIG_SYS_CONSOLE_INFO_QUIET
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 CONFIG_SYS_CORE_SRAM
 CONFIG_SYS_CORE_SRAM_SIZE
 CONFIG_SYS_CORTEX_R4

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:23 UTC #55 lore raw

PATCH v3 26/29 Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 9 lines

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
---
Changes in v3: None
Changes in v2: None

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Simon Glass

author

2016-09-29 20:23 UTC #56 lore raw

PATCH v3 27/29 Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_INFO_QUIET

Signed-off-by Simon Glass <[email protected]>

---

Changes in v3: None
Changes in v2:
- Make CONFIG_SYS_CONSOLE_INFO_QUIET the default if !CONFIG_MUX

 README                                                  | 3 ---
 common/Kconfig                                          | 9 +++++++++
 configs/MIP405T_defconfig                               | 1 +
 configs/MIP405_defconfig                                | 1 +
 configs/PIP405_defconfig                                | 1 +
 configs/bayleybay_defconfig                             | 1 +
 configs/brppt1_mmc_defconfig                            | 1 +
 configs/brppt1_nand_defconfig                           | 1 +
 configs/brppt1_spi_defconfig                            | 1 +
 configs/brxre1_defconfig                                | 1 +
 configs/chromebook_link_defconfig                       | 1 +
 configs/chromebook_samus_defconfig                      | 1 +
 configs/chromebox_panther_defconfig                     | 1 +
 configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
 configs/conga-qeval20-qa3-e3845_defconfig               | 1 +
 configs/coreboot-x86_defconfig                          | 1 +
 configs/cougarcanyon2_defconfig                         | 1 +
 configs/crownbay_defconfig                              | 1 +
 configs/dfi-bt700-q7x-151_defconfig                     | 1 +
 configs/ea20_defconfig                                  | 1 +
 configs/efi-x86_defconfig                               | 1 +
 configs/galileo_defconfig                               | 1 +
 configs/icon_defconfig                                  | 1 +
 configs/lwmon5_defconfig                                | 1 +
 configs/minnowmax_defconfig                             | 1 +
 configs/pxm2_defconfig                                  | 1 +
 configs/qemu-x86_defconfig                              | 1 +
 configs/qemu-x86_efi_payload32_defconfig                | 1 +
 configs/qemu-x86_efi_payload64_defconfig                | 1 +
 configs/rut_defconfig                                   | 1 +
 configs/som-db5800-som-6867_defconfig                   | 1 +
 configs/theadorable-x86-dfi-bt700_defconfig             | 1 +
 configs/theadorable_debug_defconfig                     | 1 +
 configs/theadorable_defconfig                           | 1 +
 include/configs/10m50_devboard.h                        | 1 -
 include/configs/3c120_devboard.h                        | 1 -
 include/configs/CPCI2DP.h                               | 2 --
 include/configs/CPCI4052.h                              | 2 +-
 include/configs/M5249EVB.h                              | 1 -
 include/configs/MIP405.h                                | 1 -
 include/configs/MigoR.h                                 | 2 --
 include/configs/PIP405.h                                | 1 -
 include/configs/PLU405.h                                | 2 --
 include/configs/PMC405DE.h                              | 1 -
 include/configs/VOM405.h                                | 2 --
 include/configs/a3m071.h                                | 2 --
 include/configs/amcc-common.h                           | 1 -
 include/configs/amcore.h                                | 1 -
 include/configs/ap325rxa.h                              | 1 -
 include/configs/ap_sh4a_4a.h                            | 1 -
 include/configs/armadillo-800eva.h                      | 1 -
 include/configs/bur_cfg_common.h                        | 1 -
 include/configs/clearfog.h                              | 1 -
 include/configs/db-88f6720.h                            | 1 -
 include/configs/db-88f6820-amc.h                        | 1 -
 include/configs/db-88f6820-gp.h                         | 1 -
 include/configs/db-mv784mp-gp.h                         | 1 -
 include/configs/ea20.h                                  | 1 -
 include/configs/ecovec.h                                | 1 -
 include/configs/hrcon.h                                 | 2 --
 include/configs/kzm9g.h                                 | 1 -
 include/configs/lsxl.h                                  | 1 -
 include/configs/lwmon5.h                                | 2 --
 include/configs/maxbcm.h                                | 1 -
 include/configs/ms7722se.h                              | 1 -
 include/configs/mvebu_db-88f3720.h                      | 1 -
 include/configs/mvebu_db-88f7040.h                      | 1 -
 include/configs/odroid.h                                | 1 -
 include/configs/openrisc-generic.h                      | 1 -
 include/configs/origen.h                                | 1 -
 include/configs/r0p7734.h                               | 1 -
 include/configs/rcar-gen2-common.h                      | 1 -
 include/configs/rcar-gen3-common.h                      | 1 -
 include/configs/s5pc210_universal.h                     | 1 -
 include/configs/sh7752evb.h                             | 1 -
 include/configs/sh7753evb.h                             | 1 -
 include/configs/sh7757lcr.h                             | 1 -
 include/configs/sh7785lcr.h                             | 1 -
 include/configs/siemens-am33x-common.h                  | 1 -
 include/configs/socfpga_sr1500.h                        | 1 -
 include/configs/spear-common.h                          | 1 -
 include/configs/strider.h                               | 2 --
 include/configs/theadorable.h                           | 1 -
 include/configs/ti814x_evm.h                            | 1 -
 include/configs/ti816x_evm.h                            | 1 -
 include/configs/ti_armv7_common.h                       | 1 -
 include/configs/trats.h                                 | 1 -
 include/configs/trats2.h                                | 1 -
 include/configs/vct.h                                   | 1 -
 include/configs/x600.h                                  | 1 -
 include/configs/x86-common.h                            | 2 --
 include/configs/xilinx-ppc.h                            | 1 -
 include/configs/xpress.h                                | 1 -
 scripts/config_whitelist.txt                            | 1 -
 94 files changed, 42 insertions(+), 72 deletions(-)

README +0 -3

index 2342484..f0c1309 100644
@@ -3582,9 +3582,6 @@ Configuration Settings:
 - CONFIG_SYS_BAUDRATE_TABLE:
 		List of legal baudrate settings for this board.
 
-- CONFIG_SYS_CONSOLE_INFO_QUIET
-		Suppress display of console information at boot.
-
 - CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
 		Begin and End addresses of the area used by the
 		simple memory test.

common/Kconfig +9 -0

index 46e93a9..ae93143 100644
@@ -327,6 +327,15 @@ config SYS_CONSOLE_ENV_OVERWRITE
 	  start-up (after relocation). This causes the environment to be
 	  updated to match the console devices actually chosen.
 
+config SYS_CONSOLE_INFO_QUIET
+	bool "Don't display the console devices on boot"
+	default y if !CONSOLE_MUX
+	help
+	  Normally U-Boot displays the current settings for stdout, stdin
+	  and stderr on boot when the post-relocation console is set up.
+	  Enable this option to supress this output. It can be obtained by
+	  calling stdio_print_current_devices() from board code.
+
 endmenu
 
 config SYS_NO_FLASH

configs/MIP405T_defconfig +1 -0

index b3a11ce..51235b2 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405T=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set

configs/MIP405_defconfig +1 -0

index 59f77d6..5977c16 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y

configs/PIP405_defconfig +1 -0

index f0ca08b..63dca82 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_PIP405=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y

configs/bayleybay_defconfig +1 -0

index e6d8418c..4bc2419 100644
@@ -17,6 +17,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/brppt1_mmc_defconfig +1 -0

index 6a349ea..021fa62 100644
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 CONFIG_BOOTDELAY=-2
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/brppt1_nand_defconfig +1 -0

index eec3848..18fdcad 100644
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_BOOTDELAY=-2
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/brppt1_spi_defconfig +1 -0

index 07f7d35..6a63db5 100644
@@ -17,6 +17,7 @@ CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=-2
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/brxre1_defconfig +1 -0

index 4851003..afdb132 100644
@@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_BOOTDELAY=-2
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/chromebook_link_defconfig +1 -0

index 7922fcc..7628e1e 100644
@@ -12,6 +12,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/chromebook_samus_defconfig +1 -0

index 7e9857e..72b864e 100644
@@ -10,6 +10,7 @@ CONFIG_SMP=y
 CONFIG_HAVE_VGA_BIOS=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/chromebox_panther_defconfig +1 -0

index acc1038..473b191 100644
@@ -10,6 +10,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0

index 7cb935e..64a90b9 100644
@@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/conga-qeval20-qa3-e3845_defconfig +1 -0

index 9209ed0..649f871 100644
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/coreboot-x86_defconfig +1 -0

index f640c5a..b83f869 100644
@@ -6,6 +6,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

configs/cougarcanyon2_defconfig +1 -0

index cfd868d..949a8fc 100644
@@ -3,6 +3,7 @@ CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="cougarcanyon2"
 CONFIG_TARGET_COUGARCANYON2=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

configs/crownbay_defconfig +1 -0

index 0ec3851..447ff7d 100644
@@ -10,6 +10,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_FIT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/dfi-bt700-q7x-151_defconfig +1 -0

index 414c615..8552f9c 100644
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/ea20_defconfig +1 -0

index b70b421..973a542 100644
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ea20 > "

configs/efi-x86_defconfig +1 -0

index c47f314..ce4ca84 100644
@@ -4,6 +4,7 @@ CONFIG_DEFAULT_DEVICE_TREE="efi"
 CONFIG_TARGET_EFI=y
 CONFIG_FIT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_IMLS is not set

configs/galileo_defconfig +1 -0

index ef6ce97..c66f24a 100644
@@ -10,6 +10,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/icon_defconfig +1 -0

index 669dc2a..4479dbb 100644
@@ -4,6 +4,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_ICON=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y

configs/lwmon5_defconfig +1 -0

index 0282d28..4e59303 100644
@@ -7,6 +7,7 @@ CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y

configs/minnowmax_defconfig +1 -0

index ebfcab7..0e40c49 100644
@@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/pxm2_defconfig +1 -0

index 8b0e999..0d0a7d3 100644
@@ -18,6 +18,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot# "

configs/qemu-x86_defconfig +1 -0

index 3acdaeb..d419039 100644
@@ -10,6 +10,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/qemu-x86_efi_payload32_defconfig +1 -0

index 13b1fef..f1096ee 100644
@@ -7,6 +7,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/qemu-x86_efi_payload64_defconfig +1 -0

index 8d48afa..ea3796b 100644
@@ -7,6 +7,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/rut_defconfig +1 -0

index ecc3e72..d73b3a5 100644
@@ -18,6 +18,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-rut"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot# "

configs/som-db5800-som-6867_defconfig +1 -0

index ba97a8e..fcd5b20 100644
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/theadorable-x86-dfi-bt700_defconfig +1 -0

index 446ce7a..d3f290e 100644
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

configs/theadorable_debug_defconfig +1 -0

index 51deddc..a400d6d 100644
@@ -13,6 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

configs/theadorable_defconfig +1 -0

index 9c7a79f..61ba811 100644
@@ -13,6 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

include/configs/10m50_devboard.h +0 -1

index ebe018a..c79e89a 100644
@@ -19,7 +19,6 @@
  * SERIAL
  */
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
 #define CONFIG_SYS_NS16550_MEM32
 
 /*

include/configs/3c120_devboard.h +0 -1

index b2126a6..8835522 100644
@@ -19,7 +19,6 @@
  * SERIAL
  */
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
 
 /*
  * CFI Flash

include/configs/CPCI2DP.h +0 -2

index 603de33..ea65bd4 100644
@@ -75,8 +75,6 @@
 
 #define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device	*/
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	1	/* don't print console @ startup*/
-
 #define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */
 
 #define CONFIG_SYS_MEMTEST_START	0x0400000	/* memtest works on	*/

include/configs/CPCI4052.h +1 -1

index afaf739..d2e5ce0 100644
@@ -96,7 +96,7 @@
 
 #define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device	*/
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	1	/* don't print console @ startup*/
+#define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */
 
 #define CONFIG_SYS_MEMTEST_START	0x0400000	/* memtest works on	*/
 #define CONFIG_SYS_MEMTEST_END		0x0C00000	/* 4 ... 12 MB in DRAM	*/

include/configs/M5249EVB.h +0 -1

index 735c4da..d61c68f 100644
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
 
 #define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device	*/
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	1	/* don't print console @ startup	*/
 #define CONFIG_AUTO_COMPLETE	1	/* add autocompletion support	*/
 #define CONFIG_MX_CYCLIC	1	/* enable mdc/mwc commands	*/

include/configs/MIP405.h +0 -1

index 1a4d602..db92967 100644
@@ -108,7 +108,6 @@
 /***************************************************************
  * defines if an overwrite_console function exists
  *************************************************************/
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 /***************************************************************
  * defines if the overwrite_console should be stored in the
  * environment

include/configs/MigoR.h +0 -2

index b31d51b..bb12785 100644
@@ -40,8 +40,6 @@
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress display of console
-								   information at boot */
 
 #define CONFIG_SYS_MEMTEST_START	(MIGO_R_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/PIP405.h +0 -1

index 5f7706df..1db7b5d 100644
@@ -104,7 +104,6 @@
 /***************************************************************
  * defines if an overwrite_console function exists
  *************************************************************/
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 /***************************************************************
  * defines if the overwrite_console should be stored in the
  * environment

include/configs/PLU405.h +0 -2

index 53e51e5..071f0a7 100644
@@ -93,8 +93,6 @@
 
 #define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device	*/
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	1	/* don't print console @ startup*/
-
 #define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */
 
 #define CONFIG_SYS_MEMTEST_START	0x0400000	/* memtest works on	*/

include/configs/PMC405DE.h +0 -1

index 0b0db20..b076851 100644
@@ -74,7 +74,6 @@
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
 
 #define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	1	/* don't print console info */
 
 #define CONFIG_SYS_MEMTEST_START	0x0100000 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x3000000 /* 1 ... 48 MB in DRAM */

include/configs/VOM405.h +0 -2

index 5e30511..5dbc1e8 100644
@@ -83,8 +83,6 @@
 
 #define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device	*/
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	1	/* don't print console @ startup*/
-
 #define CONFIG_SYS_MEMTEST_START	0x0400000	/* memtest works on	*/
 #define CONFIG_SYS_MEMTEST_END		0x0C00000	/* 4 ... 12 MB in DRAM	*/

include/configs/a3m071.h +0 -2

index 8bb13ec..640ee9f 100644
@@ -247,8 +247,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR		0x00100000
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup*/
-
 /*
  * Various low-level settings
  */

include/configs/amcc-common.h +0 -1

index f4261e9..7974c53 100644
@@ -78,7 +78,6 @@
 #define CONFIG_CMDLINE_EDITING		/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support	*/
 #define CONFIG_MX_CYCLIC		/* enable mdc/mwc commands      */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup*/
 
 #define CONFIG_LOADS_ECHO		/* echo on for serial download	*/
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change	*/

include/configs/amcore.h +0 -1

index fcb82e2..4a54cb6 100644
@@ -51,7 +51,6 @@
 /* Boot argument buffer size	*/
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	1 /* no console @ startup	*/
 #define CONFIG_AUTO_COMPLETE		1 /* add autocompletion support	*/
 #define CONFIG_MX_CYCLIC		1 /* enable mdc/mwc commands	*/

include/configs/ap325rxa.h +0 -1

index 153d162..9a4d2c9 100644
@@ -55,7 +55,6 @@
 #define CONFIG_CONS_SCIF5	1
 
 /* Suppress display of console information at boot */
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_MEMTEST_START	(AP325RXA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/ap_sh4a_4a.h +0 -1

index e922cdf..93205aa 100644
@@ -71,7 +71,6 @@
 #define CONFIG_CONS_SCIF4	1
 
 /* Suppress display of console information at boot */
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/armadillo-800eva.h +0 -1

index e6761c3..817ddab 100644
@@ -60,7 +60,6 @@
 #define SCIF2_BASE		0xe6c60000
 #define SCIF4_BASE		0xe6c80000
 #define	CONFIG_SCIF_A
-#undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_MEMTEST_START	(ARMADILLO_800EVA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/bur_cfg_common.h +0 -1

index 16237e6..5c99860 100644
@@ -39,7 +39,6 @@
 #define CONFIG_NETCONSOLE		1
 #define CONFIG_BOOTP_MAY_FAIL		/* if we don't have DHCP environment */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */
 
 /* As stated above, the following choices are optional. */

include/configs/clearfog.h +0 -1

index 3990900..21b391b 100644
@@ -87,7 +87,6 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */

include/configs/db-88f6720.h +0 -1

index a134889..282d5e8 100644
@@ -50,7 +50,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 
 /* Additional FS support/configuration */

include/configs/db-88f6820-amc.h +0 -1

index a6d0221..446596e 100644
@@ -72,7 +72,6 @@
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */

include/configs/db-88f6820-gp.h +0 -1

index 48b4b2e..1f2f6b8 100644
@@ -88,7 +88,6 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */

include/configs/db-mv784mp-gp.h +0 -1

index c43dece..d81efa9 100644
@@ -55,7 +55,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 
 /* SATA support */

include/configs/ea20.h +0 -1

index e3fdc5e..f897145 100644
@@ -104,7 +104,6 @@
 #define CONFIG_VIDEO_DA8XX
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CMD_BMP

include/configs/ecovec.h +0 -1

index dd925a9..e1e3c78 100644
@@ -91,7 +91,6 @@
 #define CONFIG_CONS_SCIF0	1
 
 /* Suppress display of console information at boot */
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/hrcon.h +0 -2

index 99dcb75..c2ffc08 100644
@@ -539,8 +539,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 
 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */

include/configs/kzm9g.h +0 -1

index 0aff6e8..b8f73d6 100644
@@ -56,7 +56,6 @@
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF4
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_MEMTEST_START	(KZM_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END \

include/configs/lsxl.h +0 -1

index 6084c8e..0caca4c 100644
@@ -36,7 +36,6 @@
 #define CONFIG_KIRKWOOD_GPIO
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /*
  * Enable u-boot API for standalone programs.

include/configs/lwmon5.h +0 -2

index 2fed3e0..638682f 100644
@@ -426,8 +426,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup*/
-
 #ifndef DEBUG
 #define CONFIG_HW_WATCHDOG	1	/* Use external HW-Watchdog	*/
 #endif

include/configs/maxbcm.h +0 -1

index 29ed284..9f4308f 100644
@@ -46,7 +46,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 
 /*

include/configs/ms7722se.h +0 -1

index 17485b5..a473eec 100644
@@ -40,7 +40,6 @@
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET			/* Suppress display of console information at boot */
 
 #define CONFIG_SYS_MEMTEST_START	(MS7722SE_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

include/configs/mvebu_db-88f3720.h +0 -1

index 7a50c4e..7ddde8c 100644
@@ -59,7 +59,6 @@
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000	/* Rst Vector Adr */
 #define CONFIG_SYS_MAXARGS	32	/* max number of command args */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 
 /* End of 16M scrubbed by training in bootrom */

include/configs/mvebu_db-88f7040.h +0 -1

index 709098f..6feb8d7 100644
@@ -62,7 +62,6 @@
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000	/* Rst Vector Adr */
 #define CONFIG_SYS_MAXARGS	32	/* max number of command args */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 
 /* End of 16M scrubbed by training in bootrom */

include/configs/odroid.h +0 -1

index 704d1e7..2828f07 100644
@@ -43,7 +43,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_BOOTARGS			"Please use defined boot"
 #define CONFIG_BOOTCOMMAND		"run autoboot"

include/configs/openrisc-generic.h +0 -1

index 227c0ca..9decae7 100644
@@ -38,7 +38,6 @@
 
 #define CONFIG_BAUDRATE			CONFIG_SYS_UART_BAUD
 #define CONFIG_SYS_BAUDRATE_TABLE	{CONFIG_BAUDRATE}
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
 #define CONSOLE_ARG			"console=console=ttyS0,115200\0"
 
 /*

include/configs/origen.h +0 -1

index a075b54..26fe402 100644
@@ -37,7 +37,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
 
 #define CONFIG_SYS_MEM_TOP_HIDE	(1 << 20)	/* ram console */

include/configs/r0p7734.h +0 -1

index d7ecdb8..0552003 100644
@@ -76,7 +76,6 @@
 #define CONFIG_CONS_SCIF3	1
 
 /* Suppress display of console information@boot */
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE	(0x88000000)

include/configs/rcar-gen2-common.h +0 -1

index e02e2d1..2d5c638 100644
@@ -42,7 +42,6 @@
 #define CONFIG_SH_GPIO_PFC
 
 /* console */
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE		256

include/configs/rcar-gen3-common.h +0 -1

index a397e64..29685ed 100644
@@ -50,7 +50,6 @@
 #define CONFIG_SH_GPIO_PFC
 
 /* console */
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE		256

include/configs/s5pc210_universal.h +0 -1

index e2d814f..0210c5b 100644
@@ -29,7 +29,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_BOOTARGS			"Please use defined boot"
 #define CONFIG_BOOTCOMMAND		"run mmcboot"

include/configs/sh7752evb.h +0 -1

index bdb8101..38bf408 100644
@@ -44,7 +44,6 @@
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1
-#undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_MEMTEST_START	(SH7752EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7753evb.h +0 -1

index eaa862c..3718bc5 100644
@@ -44,7 +44,6 @@
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1
-#undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_MEMTEST_START	(SH7753EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7757lcr.h +0 -1

index 8e4ff1c..8820e15 100644
@@ -44,7 +44,6 @@
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1
-#undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_MEMTEST_START	(SH7757LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/sh7785lcr.h +0 -1

index 86057c1..11a4cf9 100644
@@ -60,7 +60,6 @@
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF1	1
 #define CONFIG_SCIF_EXT_CLOCK	1
-#undef	CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_MEMTEST_START	(SH7785LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \

include/configs/siemens-am33x-common.h +0 -1

index c53bd66..7de3cf6 100644
@@ -110,7 +110,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_SERIAL1                  1
 #define CONFIG_CONS_INDEX               1

include/configs/socfpga_sr1500.h +0 -1

index 286e746..0407f03 100644
@@ -25,7 +25,6 @@
 #define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 
 /* Ethernet on SoC (EMAC) */
 #define CONFIG_PHY_INTERFACE_MODE	PHY_INTERFACE_MODE_RGMII

include/configs/spear-common.h +0 -1

index a6973c5..c201d0a 100644
@@ -190,7 +190,6 @@
 #define CONFIG_SYS_MAXARGS			16
 #define CONFIG_SYS_BARGSIZE			CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LOAD_ADDR			0x00800000
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO

include/configs/strider.h +0 -2

index 5cd37d7..92ad95e 100644
@@ -573,8 +573,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 
 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */

include/configs/theadorable.h +0 -1

index fe2ca6f..a51ffb5 100644
@@ -63,7 +63,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_PREBOOT

include/configs/ti814x_evm.h +0 -1

index 22a8e4f..e7f4fba 100644
@@ -149,7 +149,6 @@
 
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_ENV_IS_NOWHERE

include/configs/ti816x_evm.h +0 -1

index b3215a2..26998d7 100644
@@ -114,7 +114,6 @@
 #define CONFIG_SERIAL2
 #define CONFIG_SERIAL3
 #define CONFIG_CONS_INDEX	1
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_ENV_IS_NOWHERE

include/configs/ti_armv7_common.h +0 -1

index f039df5..1b6d4ad 100644
@@ -147,7 +147,6 @@
  * console baudrate of 115200 and use the default baud rate table.
  */
 #define CONFIG_SYS_MALLOC_LEN		SZ_32M
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_ENV_VARS_UBOOT_CONFIG	/* Strongly encouraged */
 #define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */

include/configs/trats.h +0 -1

index 9fc6513..a26d663 100644
@@ -41,7 +41,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* MACH_TYPE_TRATS macro will be removed once added to mach-types */
 #define MACH_TYPE_TRATS			3928

include/configs/trats2.h +0 -1

index c437c13..1633c67 100644
@@ -38,7 +38,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_BOOTARGS			"Please use defined boot"
 #define CONFIG_BOOTCOMMAND		"run autoboot"

include/configs/vct.h +0 -1

index f2e0e5c..ef0d648 100644
@@ -142,7 +142,6 @@
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args	*/
 #define CONFIG_TIMESTAMP			/* Print image info with timestamp */
 #define CONFIG_CMDLINE_EDITING			/* add command line history	*/
-#define CONFIG_SYS_CONSOLE_INFO_QUIET		/* don't print console @ startup*/
 
 /*
  * FLASH and environment organization

include/configs/x600.h +0 -1

index f15b1f9..088ad90 100644
@@ -156,7 +156,6 @@
 #define CONFIG_SYS_MAXARGS			16
 #define CONFIG_SYS_BARGSIZE			CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LOAD_ADDR			0x00800000
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /* Use last 2 lwords in internal SRAM for bootcounter */
 #define CONFIG_BOOTCOUNT_LIMIT

include/configs/x86-common.h +0 -2

index ebb257b..7742020 100644
@@ -84,8 +84,6 @@
 #endif
 #define CONFIG_PARTITION_UUIDS
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
 /* x86 GPIOs are accessed through a PCI device */
 #define CONFIG_INTEL_ICH6_GPIO

include/configs/xilinx-ppc.h +0 -1

index 6c52582..47c1ddf 100644
@@ -57,7 +57,6 @@
 #define CONFIG_CMDLINE_EDITING		/* add command line history     */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 #define CONFIG_MX_CYCLIC		/* enable mdc/mwc commands      */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_LOADS_ECHO		/* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change        */
 #define CONFIG_SYS_BOOTMAPSZ		(8 << 20)

include/configs/xpress.h +0 -1

index dd28e6a..3ea588a 100644
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_HZ			1000
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */

scripts/config_whitelist.txt +0 -1

index f4b353a..94b3108 100644
@@ -4610,7 +4610,6 @@ CONFIG_SYS_CMXFCR_VALUE1
 CONFIG_SYS_CMXFCR_VALUE2
 CONFIG_SYS_CMXFCR_VALUE3
 CONFIG_SYS_CMXSCR_VALUE
-CONFIG_SYS_CONSOLE_INFO_QUIET
 CONFIG_SYS_CORE_SRAM
 CONFIG_SYS_CORE_SRAM_SIZE
 CONFIG_SYS_CORTEX_R4

Signature · 1 line

2.8.0.rc3.226.g39d4020

Heiko Schocher

2016-09-30 05:24 UTC #57 lore raw

PATCH v3 27/29 Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 9 lines

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_INFO_QUIET
Signed-off-by Simon Glass <[email protected]>
---
Changes in v3: None
Changes in v2:
- Make CONFIG_SYS_CONSOLE_INFO_QUIET the default if !CONFIG_MUX

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Tom Rini

2016-10-01 02:39 UTC #58 lore raw

PATCH v3 27/29 Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig

In reply to Simon Glass

Quoted 4 lines · Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_INFO_QUIET
Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160930/a6938eef/attachment.sig>

Simon Glass

author

2016-09-29 20:23 UTC #59 lore raw

PATCH v3 28/29 Convert CONFIG_USB_KEYBOARD to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_USB_KEYBOARD

Signed-off-by Simon Glass <[email protected]>

---

Changes in v3: None
Changes in v2:
- Add new patch to convert CONFIG_USB_KEYBOARD to Kconfig

 configs/Cyrus_P5020_defconfig                           | 1 +
 configs/Cyrus_P5040_defconfig                           | 1 +
 configs/MIP405_defconfig                                | 1 +
 configs/PIP405_defconfig                                | 1 +
 configs/VCMA9_defconfig                                 | 1 +
 configs/at91rm9200ek_defconfig                          | 1 +
 configs/at91rm9200ek_ram_defconfig                      | 1 +
 configs/bayleybay_defconfig                             | 1 +
 configs/cgtqmx6eval_defconfig                           | 1 +
 configs/chromebook_link_defconfig                       | 1 +
 configs/chromebook_samus_defconfig                      | 1 +
 configs/chromebox_panther_defconfig                     | 1 +
 configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
 configs/conga-qeval20-qa3-e3845_defconfig               | 1 +
 configs/coreboot-x86_defconfig                          | 1 +
 configs/cougarcanyon2_defconfig                         | 1 +
 configs/crownbay_defconfig                              | 1 +
 configs/dfi-bt700-q7x-151_defconfig                     | 1 +
 configs/dms-ba16-1g_defconfig                           | 1 +
 configs/dms-ba16_defconfig                              | 1 +
 configs/efi-x86_defconfig                               | 1 +
 configs/galileo_defconfig                               | 1 +
 configs/gwventana_defconfig                             | 1 +
 configs/minnowmax_defconfig                             | 1 +
 configs/mx6cuboxi_defconfig                             | 1 +
 configs/mx6qsabrelite_defconfig                         | 1 +
 configs/nitrogen6dl2g_defconfig                         | 1 +
 configs/nitrogen6dl_defconfig                           | 1 +
 configs/nitrogen6q2g_defconfig                          | 1 +
 configs/nitrogen6q_defconfig                            | 1 +
 configs/nitrogen6s1g_defconfig                          | 1 +
 configs/nitrogen6s_defconfig                            | 1 +
 configs/novena_defconfig                                | 1 +
 configs/qemu-x86_defconfig                              | 1 +
 configs/qemu-x86_efi_payload32_defconfig                | 1 +
 configs/qemu-x86_efi_payload64_defconfig                | 1 +
 configs/rpi_2_defconfig                                 | 1 +
 configs/rpi_3_32b_defconfig                             | 1 +
 configs/rpi_3_defconfig                                 | 1 +
 configs/rpi_defconfig                                   | 1 +
 configs/seaboard_defconfig                              | 1 +
 configs/smdk2410_defconfig                              | 1 +
 configs/som-db5800-som-6867_defconfig                   | 1 +
 configs/tbs2910_defconfig                               | 1 +
 configs/theadorable-x86-dfi-bt700_defconfig             | 1 +
 configs/ventana_defconfig                               | 1 +
 include/configs/MIP405.h                                | 1 -
 include/configs/MPC8610HPCD.h                           | 1 -
 include/configs/MPC8641HPCN.h                           | 1 -
 include/configs/PIP405.h                                | 1 -
 include/configs/VCMA9.h                                 | 1 -
 include/configs/advantech_dms-ba16.h                    | 1 -
 include/configs/at91rm9200ek.h                          | 1 -
 include/configs/cgtqmx6eval.h                           | 1 -
 include/configs/cyrus.h                                 | 1 -
 include/configs/ge_bx50v3.h                             | 1 -
 include/configs/gw_ventana.h                            | 1 -
 include/configs/mx6cuboxi.h                             | 1 -
 include/configs/nitrogen6x.h                            | 1 -
 include/configs/novena.h                                | 1 -
 include/configs/rpi.h                                   | 1 -
 include/configs/seaboard.h                              | 1 -
 include/configs/smdk2410.h                              | 1 -
 include/configs/tbs2910.h                               | 1 -
 include/configs/ventana.h                               | 1 -
 include/configs/x86-common.h                            | 1 -
 66 files changed, 46 insertions(+), 20 deletions(-)

configs/Cyrus_P5020_defconfig +1 -0

index 6495440..5eb56602 100644
@@ -26,4 +26,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_OF_LIBFDT=y

configs/Cyrus_P5040_defconfig +1 -0

index 4566abb..e33340b 100644
@@ -26,4 +26,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_OF_LIBFDT=y

configs/MIP405_defconfig +1 -0

index 5977c16..939687c 100644
@@ -19,5 +19,6 @@ CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_VIDEO_CT69000=y

configs/PIP405_defconfig +1 -0

index 63dca82..9b4c38c 100644
@@ -19,5 +19,6 @@ CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_VIDEO_CT69000=y

configs/VCMA9_defconfig +1 -0

index da568a1..e464c21 100644
@@ -14,3 +14,4 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y

configs/at91rm9200ek_defconfig +1 -0

index e4f7196..293cab0 100644
@@ -14,4 +14,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_OF_LIBFDT=y

configs/at91rm9200ek_ram_defconfig +1 -0

index c04cd73..c5466d4 100644
@@ -15,4 +15,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_OF_LIBFDT=y

configs/bayleybay_defconfig +1 -0

index 4bc2419..f53a4ce 100644
@@ -56,6 +56,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

configs/cgtqmx6eval_defconfig +1 -0

index 3499914..82e972a 100644
@@ -44,6 +44,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/chromebook_link_defconfig +1 -0

index 7628e1e..14503f8 100644
@@ -60,6 +60,7 @@ CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

configs/chromebook_samus_defconfig +1 -0

index 72b864e..ca882e4 100644
@@ -57,6 +57,7 @@ CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_DM_VIDEO=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

configs/chromebox_panther_defconfig +1 -0

index 473b191..579eb01 100644
@@ -52,6 +52,7 @@ CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0

index 64a90b9..7ccd033 100644
@@ -64,6 +64,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y

configs/conga-qeval20-qa3-e3845_defconfig +1 -0

index 649f871..c9488fd 100644
@@ -63,6 +63,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y

configs/coreboot-x86_defconfig +1 -0

index b83f869..8b9c54c 100644
@@ -43,6 +43,7 @@ CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

configs/cougarcanyon2_defconfig +1 -0

index 949a8fc..233fe09 100644
@@ -34,4 +34,5 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/crownbay_defconfig +1 -0

index 447ff7d..0a4eab5 100644
@@ -50,6 +50,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_CFB_CONSOLE=y

configs/dfi-bt700-q7x-151_defconfig +1 -0

index 8552f9c..be822d6 100644
@@ -61,6 +61,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y

configs/dms-ba16-1g_defconfig +1 -0

index 3236788..3ccba12 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/dms-ba16_defconfig +1 -0

index 2c14ce5..e765403 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/efi-x86_defconfig +1 -0

index ce4ca84..b31c73b 100644
@@ -32,4 +32,5 @@ CONFIG_ICH_SPI=y
 CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_EFI=y

configs/galileo_defconfig +1 -0

index c66f24a..0220357 100644
@@ -50,4 +50,5 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/gwventana_defconfig +1 -0

index 678d803..1625eed 100644
@@ -48,6 +48,7 @@ CONFIG_E1000=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/minnowmax_defconfig +1 -0

index 0e40c49..ed08d36 100644
@@ -60,6 +60,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

configs/mx6cuboxi_defconfig +1 -0

index 59ae1a1..6fb3d98 100644
@@ -34,4 +34,5 @@ CONFIG_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_OF_LIBFDT=y

configs/mx6qsabrelite_defconfig +1 -0

index d4e3c3d..14e2f1f 100644
@@ -33,6 +33,7 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/nitrogen6dl2g_defconfig +1 -0

index 33c6da7..b6e0c46 100644
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/nitrogen6dl_defconfig +1 -0

index a39e502..5b9c13e 100644
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/nitrogen6q2g_defconfig +1 -0

index 7dacaeb..b9bd0be 100644
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/nitrogen6q_defconfig +1 -0

index 63ceb01..2d90ed5 100644
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/nitrogen6s1g_defconfig +1 -0

index 094fe5a..1806c48 100644
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/nitrogen6s_defconfig +1 -0

index ad58fa4..cd0aeff 100644
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/novena_defconfig +1 -0

index f0116f8..81c0297 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/qemu-x86_defconfig +1 -0

index d419039..6c1038a 100644
@@ -47,6 +47,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y

configs/qemu-x86_efi_payload32_defconfig +1 -0

index f1096ee..188bd7b 100644
@@ -44,6 +44,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y

configs/qemu-x86_efi_payload64_defconfig +1 -0

index ea3796b..fd6a5e3 100644
@@ -44,6 +44,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y

configs/rpi_2_defconfig +1 -0

index 4a30450..59bfd05 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT=y

configs/rpi_3_32b_defconfig +1 -0

index b622afe..d37f40f 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_FS_GENERIC=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT=y

configs/rpi_3_defconfig +1 -0

index df639aa..3e13f20 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_FS_GENERIC=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT=y

configs/rpi_defconfig +1 -0

index f0418f0..00fdc71 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT=y

configs/seaboard_defconfig +1 -0

index 230c4b8..5859550 100644
@@ -38,6 +38,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
 CONFIG_CONSOLE_SCROLL_LINES=10

configs/smdk2410_defconfig +1 -0

index 1cb7960..da2be2d 100644
@@ -13,3 +13,4 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y

configs/som-db5800-som-6867_defconfig +1 -0

index fcd5b20..efa2ae8 100644
@@ -58,6 +58,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

configs/tbs2910_defconfig +1 -0

index 8c342eb..d63bd6e 100644
@@ -32,6 +32,7 @@ CONFIG_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/theadorable-x86-dfi-bt700_defconfig +1 -0

index d3f290e..4973dcc 100644
@@ -58,6 +58,7 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y

configs/ventana_defconfig +1 -0

index aac1818..3da92f4 100644
@@ -37,6 +37,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
 CONFIG_CONSOLE_SCROLL_LINES=10

include/configs/MIP405.h +0 -1

index db92967..0538332 100644
@@ -346,7 +346,6 @@
  ************************************************************/
 #if !defined(CONFIG_TARGET_MIP405T)
 #define CONFIG_USB_UHCI
-#define CONFIG_USB_KEYBOARD
 
 /* Enable needed helper functions */
 #define CONFIG_SYS_STDIO_DEREGISTER		/* needs stdio_deregister */

include/configs/MPC8610HPCD.h +0 -1

index 7882b35..b047466 100644
@@ -285,7 +285,6 @@
  ************************************************************/
 #define CONFIG_PCI_OHCI		1
 #define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_USB_KEYBOARD	1
 #define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL	1
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME	"ohci_pci"

include/configs/MPC8641HPCN.h +0 -1

index 2c15f3d..fe0868f 100644
@@ -363,7 +363,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  ************************************************************/
 #define CONFIG_PCI_OHCI			1
 #define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_USB_KEYBOARD		1
 #define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL		1
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"ohci_pci"

include/configs/PIP405.h +0 -1

index 1db7b5d..eaa8b26 100644
@@ -306,7 +306,6 @@
  * USB support
  ************************************************************/
 #define CONFIG_USB_UHCI
-#define CONFIG_USB_KEYBOARD
 
 /* Enable needed helper functions */
 #define CONFIG_SYS_STDIO_DEREGISTER		/* needs stdio_deregister */

include/configs/VCMA9.h +0 -1

index 913b099..b570fd3 100644
@@ -100,7 +100,6 @@
 /* USB support (currently only works with D-cache off) */
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_OHCI_S3C24XX
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_DOS_PARTITION
 
 /* Enable needed helper functions */

include/configs/advantech_dms-ba16.h +0 -1

index bbf97c7..304994a 100644
@@ -72,7 +72,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 
 #define CONFIG_USBD_HS

include/configs/at91rm9200ek.h +0 -1

index 3cc8d89..ed0daf5 100644
@@ -144,7 +144,6 @@
 #define CONFIG_USB_ATMEL			1
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW			1
-#define CONFIG_USB_KEYBOARD			1
 #define CONFIG_DOS_PARTITION			1
 
 #define CONFIG_SYS_USB_OHCI_CPU_INIT		1

include/configs/cgtqmx6eval.h +0 -1

index d474bc1..bccfedf 100644
@@ -74,7 +74,6 @@
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 
 #define CONFIG_USBD_HS

include/configs/cyrus.h +0 -1

index 78eb567..31f2437 100644
@@ -448,7 +448,6 @@
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_EHCI_IS_TDI
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL
  /* _VIA_CONTROL_EP  */

include/configs/ge_bx50v3.h +0 -1

index a3c2bd4..4adb8e2 100644
@@ -83,7 +83,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 
 #define CONFIG_CI_UDC

include/configs/gw_ventana.h +0 -1

index d3bc836..ba6b5bc 100644
@@ -169,7 +169,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET  /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS      0
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_USBD_HS
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_CDC

include/configs/mx6cuboxi.h +0 -1

index 82957d6..446b3bc 100644
@@ -52,7 +52,6 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL
 #define CONFIG_PREBOOT \
 	"if hdmidet; then " \

include/configs/nitrogen6x.h +0 -1

index b32e49e..8ab2486 100644
@@ -85,7 +85,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 
 /* Miscellaneous commands */

include/configs/novena.h +0 -1

index 0983b96..ee4267a 100644
@@ -142,7 +142,6 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX6
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 #define CONFIG_USB_HOST_ETHER

include/configs/rpi.h +0 -1

index 7fe469c..25a90cc 100644
@@ -100,7 +100,6 @@
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_TFTP_TSIZE
 #define CONFIG_MISC_INIT_R
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL
 #define CONFIG_SYS_STDIO_DEREGISTER
 #endif

include/configs/seaboard.h +0 -1

index fe68437..2b6509a 100644
@@ -57,7 +57,6 @@
 #define CONFIG_KEYBOARD
 
 /* USB keyboard */
-#define CONFIG_USB_KEYBOARD
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK

include/configs/smdk2410.h +0 -1

index f83a9c8..f5b3690 100644
@@ -50,7 +50,6 @@
  ************************************************************/
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_OHCI_S3C24XX
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_DOS_PARTITION
 
 /************************************************************

include/configs/tbs2910.h +0 -1

index 8fdeaa1..890bd69 100644
@@ -112,7 +112,6 @@
 #define CONFIG_USBD_HS
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
-#define CONFIG_USB_KEYBOARD
 #ifdef CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
 #define CONFIG_SYS_STDIO_DEREGISTER

include/configs/ventana.h +0 -1

index d3843d4..7a38869 100644
@@ -42,7 +42,6 @@
 /* General networking support */
 
 /* USB keyboard */
-#define CONFIG_USB_KEYBOARD
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK

include/configs/x86-common.h +0 -1

index 7742020..fa07417 100644
@@ -166,7 +166,6 @@
 #define CONFIG_USB_EHCI_PCI
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     12
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
-#define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL
 
 #define CONFIG_USB_HOST_ETHER

Signature · 1 line

2.8.0.rc3.226.g39d4020

Tom Rini

2016-10-01 02:38 UTC #60 lore raw

PATCH v3 28/29 Convert CONFIG_USB_KEYBOARD to Kconfig

Quoted 4 lines · Simon Glass

This converts the following to Kconfig:
CONFIG_USB_KEYBOARD
Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160930/1d74f97b/attachment.sig>

Simon Glass

author

2016-09-29 20:23 UTC #61 lore raw

PATCH v3 29/29 Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_STDIO_DEREGISTER

This option should never be enabled in SPL, so use CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) when checking the option.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v3: None
Changes in v2:
- Make CONFIG_SYS_STDIO_DEREGISTER the default if USB_KEYBOARD
- Drop Kconfig changes

 common/Kconfig                      | 9 +++++++++
 common/stdio.c                      | 6 +++---
 common/usb_kbd.c                    | 2 +-
 configs/MPC8610HPCD_defconfig       | 1 +
 configs/MPC8641HPCN_36BIT_defconfig | 1 +
 configs/MPC8641HPCN_defconfig       | 1 +
 drivers/serial/serial-uclass.c      | 2 +-
 include/configs/MIP405.h            | 1 -
 include/configs/MPC8610HPCD.h       | 1 -
 include/configs/MPC8641HPCN.h       | 1 -
 include/configs/PIP405.h            | 1 -
 include/configs/VCMA9.h             | 1 -
 include/configs/cm_fx6.h            | 1 -
 include/configs/cyrus.h             | 1 -
 include/configs/gr_ep2s60.h         | 1 -
 include/configs/novena.h            | 1 -
 include/configs/rpi.h               | 1 -
 include/configs/sandbox.h           | 2 --
 include/configs/sunxi-common.h      | 1 -
 include/configs/tbs2910.h           | 1 -
 include/configs/tegra-common.h      | 4 ----
 include/configs/x86-common.h        | 2 --
 include/stdio_dev.h                 | 2 +-
 scripts/config_whitelist.txt        | 1 -
 24 files changed, 18 insertions(+), 27 deletions(-)

common/Kconfig +9 -0

index ae93143..936c8bc 100644
@@ -336,6 +336,15 @@ config SYS_CONSOLE_INFO_QUIET
 	  Enable this option to supress this output. It can be obtained by
 	  calling stdio_print_current_devices() from board code.
 
+config SYS_STDIO_DEREGISTER
+	bool "Allow deregistering stdio devices"
+	default y if USB_KEYBOARD
+	help
+	  Generally there is no need to deregister stdio devices since they
+	  are never deactivated. But if a stdio device is used which can be
+	  removed (for example a USB keyboard) then this option can be
+	  enabled to ensure this is handled correctly.
+
 endmenu
 
 config SYS_NO_FLASH

common/stdio.c +3 -3

index f99cfe7..c849a9a 100644
@@ -37,7 +37,7 @@ char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
 #define	CONFIG_SYS_DEVICE_NULLDEV	1
 #endif
 
-#ifdef	CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
 #define	CONFIG_SYS_DEVICE_NULLDEV	1
 #endif

@@ -177,7 +177,7 @@ int stdio_register(struct stdio_dev *dev)
 /* deregister the device "devname".
  * returns 0 if success, -1 if device is assigned and 1 if devname not found
  */
-#ifdef	CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
 int stdio_deregister_dev(struct stdio_dev *dev, int force)
 {
 	int l;

@@ -224,7 +224,7 @@ int stdio_deregister(const char *devname, int force)
 
 	return stdio_deregister_dev(dev, force);
 }
-#endif	/* CONFIG_SYS_STDIO_DEREGISTER */
+#endif /* CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) */
 
 int stdio_init_tables(void)
 {

common/usb_kbd.c +1 -1

index a9872a6..5f9a64a 100644
@@ -570,7 +570,7 @@ int drv_usb_kbd_init(void)
 /* Deregister the keyboard. */
 int usb_kbd_deregister(int force)
 {
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
 	struct stdio_dev *dev;
 	struct usb_device *usb_kbd_dev;
 	struct usb_kbd_pdata *data;

configs/MPC8610HPCD_defconfig +1 -0

index 2c03ba2..1ff4fdb 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_MPC8610HPCD=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y

configs/MPC8641HPCN_36BIT_defconfig +1 -0

index 0c3d60b..dafdf58 100644
@@ -6,6 +6,7 @@ CONFIG_PHYS_64BIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y

configs/MPC8641HPCN_defconfig +1 -0

index d2250ec..1f7ceb3 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_MPC8641HPCN=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y

drivers/serial/serial-uclass.c +1 -1

index 19f38e1..43c028e 100644
@@ -346,7 +346,7 @@ static int serial_post_probe(struct udevice *dev)
 
 static int serial_pre_remove(struct udevice *dev)
 {
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
 	struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
 
 	if (stdio_deregister_dev(upriv->sdev, 0))

include/configs/MIP405.h +0 -1

index 0538332..9aba1dd 100644
@@ -348,7 +348,6 @@
 #define CONFIG_USB_UHCI
 
 /* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER		/* needs stdio_deregister */
 #endif
 /************************************************************
  * Debug support

include/configs/MPC8610HPCD.h +0 -1

index b047466..9c98738 100644
@@ -285,7 +285,6 @@
  ************************************************************/
 #define CONFIG_PCI_OHCI		1
 #define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL	1
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME	"ohci_pci"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15

include/configs/MPC8641HPCN.h +0 -1

index fe0868f..ef5653f 100644
@@ -363,7 +363,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  ************************************************************/
 #define CONFIG_PCI_OHCI			1
 #define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL		1
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"ohci_pci"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15

include/configs/PIP405.h +0 -1

index eaa8b26..8516eb7 100644
@@ -308,7 +308,6 @@
 #define CONFIG_USB_UHCI
 
 /* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER		/* needs stdio_deregister */
 
 /************************************************************
  * Debug support

include/configs/VCMA9.h +0 -1

index b570fd3..f58c18b 100644
@@ -103,7 +103,6 @@
 #define CONFIG_DOS_PARTITION
 
 /* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER	/* needs stdio_deregister */
 
 /* RTC */
 #define CONFIG_RTC_S3C24X0

include/configs/cm_fx6.h +0 -1

index 325c019..8b1e30d 100644
@@ -211,7 +211,6 @@
 #define CONFIG_MXC_USB_FLAGS		0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
-#define CONFIG_SYS_STDIO_DEREGISTER
 
 /* I2C */
 #define CONFIG_SYS_I2C

include/configs/cyrus.h +0 -1

index 31f2437..474eef1 100644
@@ -448,7 +448,6 @@
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_EHCI_IS_TDI
-#define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL
  /* _VIA_CONTROL_EP  */
 #endif

include/configs/gr_ep2s60.h +0 -1

index fa10676..544e5fc 100644
@@ -60,7 +60,6 @@
 #if USE_GRUSB
 #define CONFIG_USB_UHCI
 /* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER	/* needs stdio_deregister */
 #endif
 
 /*

include/configs/novena.h +0 -1

index ee4267a..ecc7e7e 100644
@@ -142,7 +142,6 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX6
-#define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

include/configs/rpi.h +0 -1

index 25a90cc..45c8234 100644
@@ -101,7 +101,6 @@
 #define CONFIG_TFTP_TSIZE
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SYS_USB_EVENT_POLL
-#define CONFIG_SYS_STDIO_DEREGISTER
 #endif
 
 /* Console UART */

include/configs/sandbox.h +0 -2

index b6533c3..31ab765 100644
@@ -25,8 +25,6 @@
 #define CONFIG_SYS_TIMER_RATE		1000000
 #endif
 
-#define CONFIG_SYS_STDIO_DEREGISTER
-
 /*
  * Number of bits in a C 'long' on this architecture. Set this to 32 when
  * building on a 32-bit machine.

include/configs/sunxi-common.h +0 -1

index a2969e7..efea259 100644
@@ -349,7 +349,6 @@ extern int soft_i2c_gpio_scl;
 
 #ifdef CONFIG_USB_KEYBOARD
 #define CONFIG_PREBOOT
-#define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
 #endif

include/configs/tbs2910.h +0 -1

index 890bd69..fba345f 100644
@@ -114,7 +114,6 @@
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #ifdef CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
-#define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_PREBOOT \
 	"usb start; " \
 	"if hdmidet; then " \

include/configs/tegra-common.h +0 -4

index 78024af..0bd6680 100644
@@ -66,10 +66,6 @@
 
 #define CONFIG_SYS_NO_FLASH
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SYS_STDIO_DEREGISTER
-#endif
-
 /*
  * Increasing the size of the IO buffer as default nfsargs size is more
  *  than 256 and so it is not possible to edit it

include/configs/x86-common.h +0 -2

index fa07417..f9b7206 100644
@@ -62,8 +62,6 @@
 					 9600, 19200, 38400, 115200}
 #define CONFIG_SYS_NS16550_PORT_MAPPED
 
-#define CONFIG_SYS_STDIO_DEREGISTER
-
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_COMMAND_HISTORY
 #define CONFIG_AUTO_COMPLETE

include/stdio_dev.h +1 -1

index 13f76be..e4fc8b1 100644
@@ -100,7 +100,7 @@ int stdio_add_devices(void);
 int stdio_init(void);
 
 void	stdio_print_current_devices(void);
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
 int stdio_deregister(const char *devname, int force);
 int stdio_deregister_dev(struct stdio_dev *dev, int force);
 #endif

scripts/config_whitelist.txt +0 -1

index 94b3108..ab44b29 100644
@@ -7694,7 +7694,6 @@ CONFIG_SYS_STACK_LENGTH
 CONFIG_SYS_STACK_SIZE
 CONFIG_SYS_STATUS_C
 CONFIG_SYS_STATUS_OK
-CONFIG_SYS_STDIO_DEREGISTER
 CONFIG_SYS_STMICRO_BOOT
 CONFIG_SYS_SUPPORT_64BIT_DATA
 CONFIG_SYS_SXCNFG_VAL

Signature · 1 line

2.8.0.rc3.226.g39d4020

Tom Rini

2016-10-01 02:38 UTC #62 lore raw

PATCH v3 29/29 Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig

Quoted 7 lines · Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_STDIO_DEREGISTER
This option should never be enabled in SPL, so use CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) when checking the option.
Signed-off-by Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160930/0c92a8e5/attachment.sig>

Tom Rini

2016-10-13 14:02 UTC #63 lore raw

v3 cover Kconfig: Move console options to Kconfig

In reply to Simon Glass

Quoted 9 lines · Simon Glass

This series moves a number of console-related CONFIG options to Kconfig. Those that are not currently used are removed.
A few unused video drivers are also removed and there are a few minor adjustments to improve the code. But mostly this follows the output of the moveconfig tool.
It is build-tested to check that everything still works. The series is available at u-boot-dm/video-working

Can you please re-base this on top of tree? The BOARDINFO/CPUINFO migration made this painful to re-apply, sorry. Thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161013/27721edf/attachment.sig>

Simon Glass

author

2016-10-13 14:51 UTC #64 lore raw

v3 cover Kconfig: Move console options to Kconfig

Hi Tom,

Quoted 9 lines · Tom Rini

Quoted 7 lines · Simon Glass
This series moves a number of console-related CONFIG options to Kconfig. Those that are not currently used are removed.
A few unused video drivers are also removed and there are a few minor adjustments to improve the code. But mostly this follows the output of the moveconfig tool.

Quoted 5 lines

Quoted 2 lines
It is build-tested to check that everything still works. The series is available at u-boot-dm/video-working
Can you please re-base this on top of tree? The BOARDINFO/CPUINFO migration made this painful to re-apply, sorry. Thanks!

Yes, will do. I should probably wait until the pending pull requests go in.

Regards,
Simon

Tom Rini

2016-10-13 15:09 UTC #65 lore raw

v3 cover Kconfig: Move console options to Kconfig

Quoted 12 lines · Simon Glass

Hi Tom,
Quoted 9 lines · Tom Rini
Quoted 7 lines · Simon Glass
This series moves a number of console-related CONFIG options to Kconfig. Those that are not currently used are removed.
A few unused video drivers are also removed and there are a few minor adjustments to improve the code. But mostly this follows the output of the moveconfig tool.

Quoted 7 lines

Quoted 5 lines
Quoted 2 lines
It is build-tested to check that everything still works. The series is available at u-boot-dm/video-working
Can you please re-base this on top of tree? The BOARDINFO/CPUINFO migration made this painful to re-apply, sorry. Thanks!
Yes, will do. I should probably wait until the pending pull requests go in.

Yeah, good idea, I see a few more configs/ changes locally.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161013/6e371b11/attachment.sig>