[U-Boot] [PATCH 24/28] Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig

Simon Glass sjg at chromium.org
Tue Sep 20 00:33:08 CEST 2016


This converts the following to Kconfig:
   CONFIG_CONSOLE_SCROLL_LINES

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

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

diff --git a/README b/README
index cf83fc3..8b9c04e 100644
--- a/README
+++ b/README
@@ -1743,12 +1743,6 @@ CBFS (Coreboot Filesystem) support
 		here, since it is cheaper to change data cache settings on
 		a per-section basis.
 
-		CONFIG_CONSOLE_SCROLL_LINES
-
-		When the console need to be scrolled, this is the number of
-		lines to scroll by. It defaults to 1. Increasing this makes
-		the console jump but can help speed up operation when scrolling
-		is slow.
 
 		CONFIG_LCD_ROTATION
 
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index cf6317a..7dbb931 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -61,4 +61,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 4979513..3c41707 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 90c701d..b3af268 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_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 df6b0a6..3a0299f 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -62,5 +62,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 0e8509e..f8c1868 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -57,5 +57,6 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 235a0bd..259d752 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -50,3 +50,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 21c87e4..cdfe863 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -69,4 +69,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 aab1c4e..ba88078 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -68,4 +68,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 95777de..fadbad1 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -45,5 +45,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 b97a60b..e4186fe 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -54,4 +54,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 ab3c9cd..5181f6b 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -66,4 +66,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index d684e1b..fb0c9f7 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 4432365..dade83c 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 fec6d7f..92b4186 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -65,4 +65,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 5f4a153..0c79414 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 b33a413..ab965f3 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -52,4 +52,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 f303ec3..155e7da 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -49,6 +49,7 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 fd78dfe..4f3f81a 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -49,6 +49,7 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 83e788b..1dfb447 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -64,6 +64,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 e3a0e2a..623ddd3 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -40,3 +40,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/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 19dd16c..34e3c55 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -63,4 +63,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=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 7a1da94..8c9335b 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -63,4 +63,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_VGA_AS_SINGLE_DEVICE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 24033cf..b0aaaf2 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_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/drivers/video/Kconfig b/drivers/video/Kconfig
index 5a9350b..e7872ed 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -490,6 +490,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 d9954c1..f65b109 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 390c243..77b647e 100644
--- a/include/configs/miniarm_rk3288.h
+++ b/include/configs/miniarm_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/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 ee924c3..14fdead 100644
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.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/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 352de68..ebb257b 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -130,7 +130,6 @@
  * Video Configuration
  */
 #define VIDEO_FB_16BPP_WORD_SWAP
-#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 2b8302a..3f7d812 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -673,7 +673,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
-- 
2.8.0.rc3.226.g39d4020



More information about the U-Boot mailing list