This converts the following to Kconfig: CONFIG_CONSOLE_SCROLL_LINES
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
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(-)
diff --git a/README b/README index 1140ccb..0257c80 100644 --- a/README +++ b/README @@ -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
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index e163250..21b0135 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -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 diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index b3c6970..8b2f53f 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -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 diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 6f2fe2a..da251a1 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -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 diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index 1822970..7e9857e 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -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 diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index f9927ff..5566508 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -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 diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index d070a27..897cd01 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -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 diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 2d31774..af96a00 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -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 diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 4b6f24e..3d67935 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -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 diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index 67febaa..99e9a94 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -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 diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 0d36863..8753271 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -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 diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 6babcc2..67ab280 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -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 diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 61c46de..d0b9595 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -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 diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index e1691f6..5c76af3 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -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 diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 3ffcbdc..e327f77 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -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 diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index 815cf4c..5e82a01 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -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 diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 8ca4a25..091c814 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -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 diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index 1e76799..e52bfa4 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -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 diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index 00dd846..d06686f 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -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 diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index def639f..ee00040 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -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 diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index 326ec28..2457b11 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -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 diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 43c3c71..097720d 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -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 diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index dc38313..63c65b7 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -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 diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index a3b1b42..33ca0bd 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -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 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index ee3f27a..573e781 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -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 diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index 180527a..b15cc26 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -23,6 +23,5 @@ #define CONFIG_KEYBOARD
#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index ba8d93c..429f571 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -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 diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index b299e15..4634989 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -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
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 390c243..77b647e 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -19,6 +19,5 @@ #define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h index 047850a..f453640 100644 --- a/include/configs/evb_rk3399.h +++ b/include/configs/evb_rk3399.h @@ -21,6 +21,5 @@ #define SDRAM_BANK_SIZE (2UL << 30)
#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h index 390c243..77b647e 100644 --- a/include/configs/fennec_rk3288.h +++ b/include/configs/fennec_rk3288.h @@ -19,6 +19,5 @@ #define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index ee924c3..14fdead 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -23,6 +23,5 @@ #define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 2ecae65..3d6b5fc 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -54,7 +54,6 @@
/* LCD support */ #define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#include "tegra-common-post.h"
diff --git a/include/configs/miniarm_rk3288.h b/include/configs/miniarm_rk3288.h index aa259db..9451365 100644 --- a/include/configs/miniarm_rk3288.h +++ b/include/configs/miniarm_rk3288.h @@ -24,6 +24,5 @@ #define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 5e59ccb..a8bb3ff 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -45,7 +45,6 @@
/* LCD support */ #define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#include "tegra-common-post.h"
diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h index 390c243..77b647e 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -19,6 +19,5 @@ #define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif diff --git a/include/configs/rock2.h b/include/configs/rock2.h index 99d6915..b9c2290 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -32,6 +32,5 @@ #endif
#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 4ad98e1..7fe469c 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -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 diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 3076ef4..fe68437 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -61,7 +61,6 @@
/* LCD support */ #define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
/* NAND support */ #define CONFIG_CMD_NAND diff --git a/include/configs/ventana.h b/include/configs/ventana.h index b282467..d3843d4 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -46,7 +46,6 @@
/* LCD support */ #define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10
#include "tegra-common-post.h"
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index d483232..e8e199a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -126,11 +126,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x20000000
/*----------------------------------------------------------------------- - * Video Configuration - */ -#define CONFIG_CONSOLE_SCROLL_LINES 5 - -/*----------------------------------------------------------------------- * CPU Features */
diff --git a/include/lcd_console.h b/include/lcd_console.h index 2e0f56f..eac227f 100644 --- a/include/lcd_console.h +++ b/include/lcd_console.h @@ -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; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fbfbe27..bc37626 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -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