Kconfig: Move console options to Kconfig
Subsystems (13)
PATCH v4 16/29 Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig
In reply to Simon GlassThis 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.
---
Changes in v4: None
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 - scripts/config_whitelist.txt | 1 - 75 files changed, 27 insertions(+), 69 deletions(-)
configs/Chuwi_V7_CW0825_defconfig +1 -0
@@ -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
@@ -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
@@ -59,4 +59,5 @@ CONFIG_DM_VIDEO=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
@@ -64,5 +64,6 @@ CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_VIDEO_IVYBRIDGE_IGD=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y
configs/chromebox_panther_defconfig +1 -0
@@ -55,5 +55,6 @@ CONFIG_DM_VIDEO=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
@@ -67,4 +67,5 @@ CONFIG_DM_VIDEO=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
@@ -66,4 +66,5 @@ CONFIG_DM_VIDEO=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
@@ -52,4 +52,5 @@ CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -64,4 +64,5 @@ CONFIG_DM_VIDEO=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
@@ -63,4 +63,5 @@ CONFIG_DM_VIDEO=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
@@ -50,4 +50,5 @@ CONFIG_DM_VIDEO=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
@@ -47,6 +47,7 @@ CONFIG_DM_VIDEO=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
@@ -47,6 +47,7 @@ CONFIG_DM_VIDEO=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
@@ -61,4 +61,5 @@ CONFIG_DM_VIDEO=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
@@ -61,4 +61,5 @@ CONFIG_DM_VIDEO=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
@@ -51,3 +51,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
@@ -41,5 +41,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
@@ -493,6 +493,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
@@ -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
@@ -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
@@ -507,7 +507,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
@@ -279,7 +279,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
@@ -466,7 +466,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
@@ -25,7 +25,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
@@ -379,7 +379,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
@@ -380,7 +380,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
@@ -401,7 +400,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
@@ -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
@@ -504,7 +504,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
@@ -510,7 +510,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
@@ -414,7 +414,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
@@ -526,7 +526,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_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
@@ -107,7 +107,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
@@ -31,10 +31,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
@@ -273,7 +273,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
@@ -38,10 +38,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
@@ -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
@@ -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
@@ -255,7 +255,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
@@ -225,7 +225,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
@@ -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
@@ -80,7 +80,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
@@ -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
@@ -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
@@ -309,7 +309,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
@@ -179,7 +179,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
@@ -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
@@ -181,7 +181,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
@@ -50,7 +50,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
@@ -445,7 +445,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
@@ -327,7 +327,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
@@ -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
@@ -199,7 +199,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
@@ -365,7 +365,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
@@ -38,7 +38,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
@@ -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
@@ -94,7 +94,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
@@ -214,7 +214,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
@@ -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
@@ -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
@@ -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
@@ -229,7 +229,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
@@ -254,7 +254,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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,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
@@ -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
@@ -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
@@ -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
@@ -175,7 +175,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
@@ -296,7 +296,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
@@ -77,7 +77,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
@@ -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
@@ -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
scripts/config_whitelist.txt +0 -1
@@ -8252,7 +8252,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
PATCH v4 16/29 Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig
Quoted 7 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_VGA_AS_SINGLE_DEVICEOnce we migrate to driver model for video, we should be able to drop this option.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, 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/20161023/218c4e3b/attachment.sig>
PATCH v4 17/29 video: Drop CONFIG_VIDEO_HW_CURSOR
In reply to Simon GlassThis is not used in U-Boot.
---
Changes in v4: None
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
@@ -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
@@ -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
@@ -8261,7 +8261,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
PATCH v4 17/29 video: Drop CONFIG_VIDEO_HW_CURSOR
Quoted 4 lines · Simon Glass
This is not used in U-Boot.
Signed-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, 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/20161023/46fe9c06/attachment.sig>
PATCH v4 18/29 Convert CONFIG_VIDEO_SW_CURSOR to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_VIDEO_SW_CURSOR
---
Changes in v4: None
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 - scripts/config_whitelist.txt | 1 - 33 files changed, 10 insertions(+), 38 deletions(-)
drivers/video/Kconfig +10 -0
@@ -503,6 +503,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
@@ -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
@@ -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
@@ -506,7 +506,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
@@ -278,7 +278,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
@@ -465,7 +465,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
@@ -24,7 +24,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
@@ -378,7 +378,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
@@ -379,7 +379,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
@@ -396,7 +395,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
@@ -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
@@ -503,7 +503,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)#define CONFIG_CMD_BMP -#define CONFIG_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
@@ -509,7 +509,6 @@ unsigned long get_board_ddr_clk(void);#ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)#define CONFIG_CMD_BMP -#define CONFIG_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
@@ -413,7 +413,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)#define CONFIG_CMD_BMP -#define CONFIG_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
@@ -525,7 +525,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg#define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)#define CONFIG_CMD_BMP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif
include/configs/TQM5200.h +0 -1
@@ -107,7 +107,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
@@ -255,7 +255,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
@@ -224,7 +224,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
@@ -79,7 +79,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
@@ -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
@@ -180,7 +180,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
@@ -50,7 +50,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
@@ -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
@@ -37,7 +37,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
@@ -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
@@ -228,7 +228,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
@@ -253,7 +253,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
@@ -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
@@ -227,7 +227,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
@@ -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
@@ -175,7 +175,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
@@ -288,7 +288,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
@@ -76,7 +76,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
scripts/config_whitelist.txt +0 -1
@@ -8278,7 +8278,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
PATCH v4 18/29 Convert CONFIG_VIDEO_SW_CURSOR to Kconfig
Quoted 5 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_VIDEO_SW_CURSORSigned-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, 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/20161023/9375f427/attachment.sig>
PATCH v4 19/29 video: Drop CONFIG_VIDEO_SW_CURSOR
In reply to Simon GlassSince 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.
---
Changes in v4: None
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
@@ -1623,7 +1623,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
@@ -503,16 +503,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
PATCH v4 19/29 video: Drop CONFIG_VIDEO_SW_CURSOR
Quoted 7 lines · 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]>
In size testing this series there are a few boards that do disable this option so I've dropped this patch. 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/20161023/7da118e7/attachment.sig>
PATCH v4 20/29 Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_CONSOLE_EXTRA_INFO
---
Changes in v4: None
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
@@ -15,4 +15,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
@@ -18,4 +18,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
@@ -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
@@ -18,4 +18,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,4 +19,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
@@ -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
@@ -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
@@ -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
@@ -503,6 +503,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
@@ -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
@@ -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
@@ -102,7 +102,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
@@ -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
@@ -49,7 +49,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
@@ -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
@@ -172,7 +172,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
@@ -671,7 +671,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
PATCH v4 20/29 Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig
Quoted 5 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_CONSOLE_EXTRA_INFOSigned-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, 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/20161023/451bf0aa/attachment.sig>
PATCH v4 21/29 video: Move video_get_info_str() prototype to a header file
In reply to Simon GlassThis should be defined in a header file so that arguments are checked. Move it to video.h.
---
Changes in v4: None
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH v4 21/29 video: Move video_get_info_str() prototype to a header file
Quoted 5 lines · 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]>
Applied to u-boot/master, 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/20161023/a274309d/attachment.sig>
PATCH v4 22/29 video: Drop CONFIG_CONSOLE_INFO_QUIET
In reply to Simon GlassThis is not used in U-Boot. Drop it.
---
Changes in v4: None
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
@@ -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_NR_DRAM_BANKS 1
include/configs/km/km_arm.h +0 -1
@@ -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_NR_DRAM_BANKS 4
include/configs/mv-common.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -671,7 +671,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
PATCH v4 22/29 video: Drop CONFIG_CONSOLE_INFO_QUIET
Quoted 4 lines · Simon Glass
This is not used in U-Boot. Drop it.
Signed-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, 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/20161023/a1a63dd9/attachment.sig>
PATCH v4 23/29 Convert CONFIG_LCD to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_LCD
---
Changes in v4: None
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
@@ -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
@@ -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
@@ -19,4 +19,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
@@ -19,4 +19,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
@@ -19,4 +19,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
@@ -22,4 +22,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
@@ -22,4 +22,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
@@ -22,4 +22,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
@@ -22,4 +22,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
@@ -22,4 +22,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
@@ -19,4 +19,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
@@ -19,4 +19,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
@@ -19,4 +19,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
@@ -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/at91sam9m10g45ek_nandflash_defconfig +1 -0
@@ -28,4 +28,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
@@ -22,4 +22,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
@@ -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/at91sam9n12ek_spiflash_defconfig +1 -0
@@ -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/at91sam9rlek_dataflash_defconfig +1 -0
@@ -19,4 +19,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
@@ -19,4 +19,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
@@ -19,4 +19,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
@@ -24,4 +24,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
@@ -24,4 +24,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
@@ -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/at91sam9x5ek_spiflash_defconfig +1 -0
@@ -31,4 +31,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
@@ -47,4 +47,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
@@ -47,4 +47,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
@@ -55,4 +55,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
@@ -46,5 +46,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -31,4 +31,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
@@ -18,3 +18,4 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y
configs/pm9263_defconfig +1 -0
@@ -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
@@ -23,5 +23,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
@@ -25,5 +25,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
@@ -24,5 +24,6 @@ CONFIG_CMD_FS_GENERIC=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT=y
configs/rpi_defconfig +1 -0
@@ -23,5 +23,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
@@ -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/sama5d3xek_nandflash_defconfig +1 -0
@@ -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/sama5d3xek_spiflash_defconfig +1 -0
@@ -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/sama5d4ek_mmc_defconfig +1 -0
@@ -33,4 +33,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
@@ -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/sama5d4ek_spiflash_defconfig +1 -0
@@ -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/snow_defconfig +1 -0
@@ -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
@@ -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
@@ -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
@@ -15,5 +15,6 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_LCD=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set
drivers/video/Kconfig +8 -0
@@ -562,4 +562,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
@@ -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
@@ -47,7 +47,6 @@#define CONFIG_BAUDRATE 115200/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR8#define CONFIG_LCD_LOGO #undef LCD_TEST_PATTERN
include/configs/at91sam9263ek.h +0 -1
@@ -57,7 +57,6 @@#define CONFIG_BAUDRATE 115200/* LCD */ -#define CONFIG_LCD 1#define LCD_BPP LCD_COLOR8#define CONFIG_LCD_LOGO 1#undef LCD_TEST_PATTERN
include/configs/at91sam9m10g45ek.h +0 -1
@@ -40,7 +40,6 @@#define CONFIG_USART_ID ATMEL_ID_SYS/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR8#define CONFIG_LCD_LOGO #undef LCD_TEST_PATTERN
include/configs/at91sam9n12ek.h +0 -1
@@ -39,7 +39,6 @@#define CONFIG_BAUDRATE 115200/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR16#define LCD_OUTPUT_BPP 24#define CONFIG_LCD_LOGO
include/configs/at91sam9rlek.h +0 -1
@@ -44,7 +44,6 @@#define CONFIG_BAUDRATE 115200/* LCD */ -#define CONFIG_LCD 1#define LCD_BPP LCD_COLOR8#define CONFIG_LCD_LOGO 1#undef LCD_TEST_PATTERN
include/configs/at91sam9x5ek.h +0 -1
@@ -35,7 +35,6 @@#define CONFIG_USART_ID ATMEL_ID_SYS/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR16#define LCD_OUTPUT_BPP 24#define CONFIG_LCD_LOGO
include/configs/brppt1.h +0 -1
@@ -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
@@ -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
@@ -280,7 +280,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
@@ -281,7 +281,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
@@ -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
@@ -21,7 +21,6 @@*/ #define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE -/*#define CONFIG_LCD*/ /* * Memory configurations
include/configs/peach-pi.h +0 -1
@@ -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
@@ -43,7 +43,6 @@#define CONFIG_USART_ID ATMEL_ID_SYS/* LCD */ -#define CONFIG_LCD #define LCD_BPP LCD_COLOR8#define CONFIG_LCD_LOGO #undef LCD_TEST_PATTERN
include/configs/pm9261.h +0 -1
@@ -149,7 +149,6 @@#define CONFIG_USART_ID ATMEL_ID_SYS/* LCD */ -#define CONFIG_LCD 1#define LCD_BPP LCD_COLOR8#define CONFIG_LCD_LOGO 1#undef LCD_TEST_PATTERN
include/configs/pm9263.h +0 -1
@@ -162,7 +162,6 @@#define CONFIG_USART_ID ATMEL_ID_SYS/* LCD */ -#define CONFIG_LCD 1#define LCD_BPP LCD_COLOR8#define CONFIG_LCD_LOGO 1#undef LCD_TEST_PATTERN
include/configs/rpi.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1876,7 +1876,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
PATCH v4 23/29 Convert CONFIG_LCD to Kconfig
Quoted 5 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_LCDSigned-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>
thanks!
Signature · 4 lines
Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India.
PATCH v4 23/29 Convert CONFIG_LCD to Kconfig
In reply to Simon GlassQuoted 6 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_LCDSigned-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>Reviewed-by Jagan Teki <[email protected]>
Applied to u-boot/master, 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/20161023/d23071cd/attachment.sig>
PATCH v4 24/29 Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_CONSOLE_SCROLL_LINES
---
Changes in v4: None
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 | 5 ----- include/lcd_console.h | 3 --- scripts/config_whitelist.txt | 1 - 43 files changed, 33 insertions(+), 30 deletions(-)
README +0 -6
@@ -1692,12 +1692,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
@@ -60,4 +60,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
@@ -79,6 +79,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
@@ -65,5 +65,6 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_VIDEO_IVYBRIDGE_IGD=y CONFIG_CFB_CONSOLE=y +CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y
configs/chromebook_samus_defconfig +1 -0
@@ -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
@@ -56,5 +56,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
@@ -54,3 +54,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
@@ -68,4 +68,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
@@ -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/coreboot-x86_defconfig +1 -0
@@ -44,5 +44,6 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_COREBOOT=y +CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y
configs/crownbay_defconfig +1 -0
@@ -53,4 +53,5 @@ CONFIG_DM_VIDEO=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
@@ -65,4 +65,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
@@ -68,6 +68,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
@@ -41,3 +41,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
@@ -64,4 +64,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
@@ -39,3 +39,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
@@ -51,4 +51,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
@@ -48,6 +48,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
@@ -48,6 +48,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
@@ -66,6 +66,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
@@ -42,3 +42,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
@@ -62,4 +62,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
@@ -62,4 +62,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
@@ -41,3 +41,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
@@ -513,6 +513,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,6 +24,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
@@ -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
@@ -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
@@ -32,6 +32,5 @@#endif #define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10#endif
include/configs/rpi.h +0 -1
@@ -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
@@ -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
@@ -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 -5
@@ -126,11 +126,6 @@#define CONFIG_SYS_LOAD_ADDR 0x20000000/*----------------------------------------------------------------------- -* Video Configuration -*/ -#define CONFIG_CONSOLE_SCROLL_LINES 5 - -/*----------------------------------------------------------------------- * CPU Features */
include/lcd_console.h +0 -3
@@ -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
@@ -671,7 +671,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
PATCH v4 24/29 Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig
Quoted 5 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_CONSOLE_SCROLL_LINESSigned-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, 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/20161023/38037eb9/attachment.sig>
PATCH v4 25/29 Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_SYS_CONSOLE_ENV_OVERWRITE
---
Changes in v4: None
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
@@ -3532,9 +3532,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
@@ -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
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
configs/socfpga_cyclone5_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
configs/socfpga_de0_nano_soc_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
configs/socfpga_is1_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
configs/socfpga_mcvevk_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
configs/socfpga_sockit_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
configs/socfpga_socrates_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
configs/socfpga_sr1500_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
configs/socfpga_vining_fpga_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_SPL=y
include/configs/MIP405.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -60,7 +60,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
@@ -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
@@ -56,7 +56,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
@@ -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
@@ -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
@@ -42,7 +42,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
@@ -50,7 +50,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -252,7 +252,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
@@ -4597,7 +4597,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
PATCH v4 25/29 Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to Kconfig
Quoted 5 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_SYS_CONSOLE_ENV_OVERWRITESigned-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, 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/20161023/a5a6df87/attachment.sig>
PATCH v4 26/29 Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
---
Changes in v4: None
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
@@ -3529,9 +3529,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
@@ -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
@@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405T=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set 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
@@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set 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
@@ -6,6 +6,7 @@ CONFIG_TARGET_PIP405=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set 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
@@ -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
@@ -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
@@ -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
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/brppt1_nand_defconfig +1 -0
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/brppt1_spi_defconfig +1 -0
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/brxre1_defconfig +1 -0
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/cgtqmx6eval_defconfig +1 -0
@@ -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
@@ -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
@@ -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
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/ge_b450v3_defconfig +1 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,6 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_CPUINFO is not set 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_DISPLAY_BOARDINFO is not set
configs/socfpga_cyclone5_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set
configs/socfpga_de0_nano_soc_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set
configs/socfpga_is1_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set
configs/socfpga_mcvevk_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set
configs/socfpga_sockit_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set
configs/socfpga_socrates_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set
configs/socfpga_sr1500_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set
configs/socfpga_vining_fpga_defconfig +1 -0
@@ -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_DISPLAY_BOARDINFO is not set
configs/wandboard_defconfig +1 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -273,7 +273,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
@@ -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
@@ -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
@@ -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
@@ -59,7 +59,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -304,8 +304,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
@@ -55,7 +55,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
@@ -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
@@ -94,7 +94,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
@@ -214,7 +214,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
@@ -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
@@ -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
@@ -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
@@ -41,7 +41,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
@@ -49,7 +49,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -251,7 +251,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
@@ -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
@@ -4598,7 +4598,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
PATCH v4 26/29 Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig
Quoted 5 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINESigned-off-by Simon Glass <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, 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/20161023/cfc99975/attachment.sig>
PATCH v4 27/29 Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_SYS_CONSOLE_INFO_QUIET
---
Changes in v4: None
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
@@ -3526,9 +3526,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
@@ -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
@@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set 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
@@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set 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
@@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set 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
@@ -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
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/brppt1_nand_defconfig +1 -0
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/brppt1_spi_defconfig +1 -0
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/brxre1_defconfig +1 -0
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/chromebook_link_defconfig +1 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/efi-x86_defconfig +1 -0
@@ -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
@@ -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
@@ -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_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y
configs/lwmon5_defconfig +1 -0
@@ -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
@@ -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
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# "
configs/qemu-x86_defconfig +1 -0
@@ -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
@@ -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
@@ -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
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +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
@@ -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
@@ -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
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable" CONFIG_FIT=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y
configs/theadorable_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable" CONFIG_FIT=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y
include/configs/10m50_devboard.h +0 -1
@@ -18,7 +18,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
@@ -18,7 +18,6 @@* SERIAL */ #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */ /* * CFI Flash
include/configs/CPCI2DP.h +0 -2
@@ -74,8 +74,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
@@ -95,7 +95,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -92,8 +92,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
@@ -73,7 +73,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
@@ -82,8 +82,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
@@ -246,8 +246,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -58,7 +58,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -54,7 +54,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,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
@@ -48,7 +48,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -189,7 +189,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
@@ -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
@@ -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
@@ -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
@@ -112,7 +112,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
@@ -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
@@ -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
@@ -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
@@ -140,7 +140,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
@@ -155,7 +155,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
@@ -83,8 +83,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
@@ -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
@@ -42,7 +42,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
@@ -4597,7 +4597,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
PATCH v4 27/29 Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig
Quoted 4 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_SYS_CONSOLE_INFO_QUIETSigned-off-by Simon Glass <[email protected]>
Applied to u-boot/master, 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/20161023/bc99b45c/attachment.sig>
PATCH v4 28/29 Convert CONFIG_USB_KEYBOARD to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_USB_KEYBOARD
---
Changes in v4: None
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
@@ -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
@@ -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
@@ -20,5 +20,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
@@ -20,5 +20,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
@@ -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
@@ -16,4 +16,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
@@ -17,4 +17,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
@@ -57,6 +57,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -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
@@ -61,6 +61,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -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
@@ -53,6 +53,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -65,6 +65,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -64,6 +64,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -45,6 +45,7 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_COREBOOT=y +CONFIG_USB_KEYBOARD=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y
configs/cougarcanyon2_defconfig +1 -0
@@ -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
@@ -51,6 +51,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -62,6 +62,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -50,6 +50,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
@@ -61,6 +61,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -48,6 +48,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -45,6 +45,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -45,6 +45,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -23,6 +23,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
@@ -25,6 +25,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
@@ -24,6 +24,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
@@ -23,6 +23,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
@@ -40,6 +40,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
@@ -14,3 +14,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
@@ -59,6 +59,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -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
@@ -59,6 +59,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=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
@@ -39,6 +39,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
@@ -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
@@ -283,7 +283,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
@@ -361,7 +361,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
@@ -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
@@ -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
@@ -69,7 +69,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
@@ -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
@@ -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
@@ -446,7 +446,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
@@ -84,7 +84,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
@@ -167,7 +167,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -114,7 +114,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
@@ -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
@@ -160,7 +160,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
PATCH v4 28/29 Convert CONFIG_USB_KEYBOARD to Kconfig
Quoted 4 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_USB_KEYBOARDSigned-off-by Simon Glass <[email protected]>
Applied to u-boot/master, 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/20161023/6c4976aa/attachment.sig>
PATCH v4 29/29 Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig
In reply to Simon GlassThis 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.
---
Changes in v4:
- Rebase to master
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
@@ -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
@@ -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
@@ -245,7 +245,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;
@@ -292,7 +292,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -283,7 +283,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
@@ -361,7 +361,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
@@ -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
@@ -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
@@ -210,7 +210,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
@@ -446,7 +446,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
@@ -58,7 +58,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
@@ -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
@@ -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
@@ -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
@@ -347,7 +347,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
@@ -116,7 +116,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
@@ -60,10 +60,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
@@ -61,8 +61,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
@@ -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
@@ -7681,7 +7681,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
PATCH v4 29/29 Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig
Quoted 7 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_SYS_STDIO_DEREGISTERThis 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]>
Applied to u-boot/master, 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/20161023/782061a5/attachment.sig>
v4 cover Kconfig: Move console options to Kconfig
In reply to Simon GlassQuoted 6 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.
So I've merged this now, and while I got almost everything correct with some re-ordering of patches and a few re-runnings of moveconfig.py, there's a few changes I want to make everyone aware of.
A number of PowerPC Freescale boards have a small SPL size increase because they used to do:
#ifndef CONFIG_SPL_BUILD
#define CONFIG_CONSOLE_MUX
#define CONFIG_CONSOLE_IS_IN_ENV
#endif
And now they do not.
Finally, sandbox_spl has a small size increase too that comes in at the stdio deregister patch but I don't see _why_.
Thanks for doing the conversion Simon!
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/20161023/39b24c0f/attachment.sig>
v4 cover Kconfig: Move console options to Kconfig
Hi Tom,
Quoted 20 lines · Tom Rini
Quoted 6 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.
So I've merged this now, and while I got almost everything correct with some re-ordering of patches and a few re-runnings of
moveconfig.py, there's a few changes I want to make everyone aware of.A number of PowerPC Freescale boards have a small SPL size increase because they used to do:
#ifndefCONFIG_SPL_BUILD
#defineCONFIG_CONSOLE_MUX
#defineCONFIG_CONSOLE_IS_IN_ENV
#endif
Quoted 6 lines
And now they do not.
Finally,
sandbox_splhas a small size increase too that comes in at the stdio deregister patch but I don't see _why_.Thanks for doing the conversion Simon!
Thanks for sorting this out and getting it in!
Regards,
Simon