Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig

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>

diff --git a/README b/README
index f5857052091b31a077bc505ee627a7606e0161f0..8697eb21e2379d6365d6535fa92b8ba642c59eab 100644 (file)
--- a/README
+++ b/README
@@ -1693,12 +1693,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 d176d52d6f81e97050ffe12f142463aba877a15e..18aa79478d49988a8bf8f963bf734509f7bd7d2b 100644 (file)
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -58,4 +58,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 e7e8b18e14b08cf487b149b1ddc3c776fc0d85f8..876adc46715858043ccea17c6ab64b1a242e6ce5 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -76,6 +76,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 86fc66bc8823c6f1d8be0227c871e939a796d541..d14cde530197ddaf07a9e4da823003357ff48bd2 100644 (file)
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -62,5 +62,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 4f8d9fa05afce6f469c26d09a0e69a18660b7ee7..f19d8613a9794149a2745c49d05fd7b8f44b9d73 100644 (file)
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -59,5 +59,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 7ce29fb17b4ef52a8b3ec509bd15c98cae1c7015..23609e0736512a2614ac7c11c4134d4d71ed2889 100644 (file)
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -53,5 +53,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 d070a27110e54c52e64f0727033b8fe26697e632..897cd01f818df9f80f4efdc5e787b6ec8a67d109 100644 (file)
--- 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 784270c0fd567c6cca028bbee706527c9da50304..a3139408681c4a7387faf6a70398c62295d97bd3 100644 (file)
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -66,4 +66,5 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index b5ef5701932ebcf3ed265ef9c9c0822919a8bca6..45220bc1899e28afbe528ae020b35bdcfb85b81c 100644 (file)
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_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/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index b33c5c4da809890af9d12dd3c23e5afbcc7980f1..964a92bdb4142c1e641cec370a353497f55e32fd 100644 (file)
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -42,5 +42,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 5bd7493c6de987ce330f5fc246ecf4680a68ee12..610172dedb3c35e758d609b01f22b025cfb8c49a 100644 (file)
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -51,4 +51,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 6dd1c39d77441f18617091fc3ce8f2680a2db118..bddfca2e01802aabf2888d3fd5acbc7475aa66b2 100644 (file)
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -63,4 +63,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 936b7e7c62025b4b9e18d79bb3fd020baffa0b83..4910c80cd88e0d00e661e37d28a6ce9f8507fa10 100644 (file)
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_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/harmony_defconfig b/configs/harmony_defconfig
index e1691f6e5ecf1b944b1800aeb455728b36e5ac0a..5c76af3f4713b08070889548d1513c7d688d1185 100644 (file)
--- 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 614dd57e118344f2b30f407e241ee04c9db80123..e25fdc5e60382ac288f11880abb43a2fb5ddc360 100644 (file)
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_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/paz00_defconfig b/configs/paz00_defconfig
index 815cf4ce46631628aa0f232d27dccb5e84448e94..5e82a015ed55dffe2ef70a106e8d3683c419dc9b 100644 (file)
--- 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 9a3a6f5dddfcc6674edd38096c0d107256180902..9cebcddd0f4708b92d265a44ea38373dcfe38040 100644 (file)
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -49,4 +49,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 296fee481dee46706211efcea1589071a531969c..395702202abc094e9d0a3190a18717dcdd2b3873 100644 (file)
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -46,6 +46,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 129d3ee091fedf72a3f8baefb9912a76bc1be5e7..988c5678e9706724576e24812150104a000bdda7 100644 (file)
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -46,6 +46,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 fa2ed0d338c8acd0615e752026ec544975152972..1883f07320d88c5b649037ca68f0b49e149b9f67 100644 (file)
--- 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/rpi_2_defconfig b/configs/rpi_2_defconfig
index b09651ada66d3f26c0adf669997d236f853fcbaf..fc34f00e61aa523eddc40d933f135c713db0b94f 100644 (file)
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index 2e7c634bbae3226d98f1db02aa005e5e377275e4..9c372bc8422f28ad9da8219e5d43350c2bfc6e76 100644 (file)
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_FS_GENERIC=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 0b0379f13f130c275c98c02c79be11a2358c73b9..9c086329959740b02adbbf8fcc183a39270c1cab 100644 (file)
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_FS_GENERIC=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index ba64c7c91511c1c1f027f76599321869bb671358..b2c55cc92b001e5dc9c589f37d19942f471ae71b 100644 (file)
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 326ec28b613758150c09a7769aed225edfbba155..2457b11040679d4753b5e9187e95270095cded49 100644 (file)
--- 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 715311fe2c9e7760485c3f31264c2ea74e5287bf..4b016634cfc57d6e8e193aa9a58710bf8d3d2010 100644 (file)
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_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/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 4f33f62c596002822f68ccec7e45e8c829ed7cd1..e0760d90410e3276c526e5086d4055e3043e225c 100644 (file)
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -60,4 +60,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 a3b1b420e958dc44019dd9aefb84e10fbbf6d3e7..33ca0bd3fb0374efb48d1f547c9d1abbeb722e54 100644 (file)
--- 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 fa9f9fa48b5773d0ce663a6601e8566849eb14e4..577e6d7b39b3ea21e2e83cf15bfaa86ea58f4e59 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -523,6 +523,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 180527a6847b914e7c54821203587e704cf20b68..b15cc26bebc961238adcee2e67ffa329eb0196be 100644 (file)
--- 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 ba8d93ce1ffdf0feb33c834a95cc1b8909c47bd8..429f571f6ec68d19939bdb42e84e40509f14cccd 100644 (file)
--- 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 b299e155a5a68dd235bf07a6bfbaea42d1f6ec28..46349896d777de1fd4afa7b9748f7acf3df1cbd4 100644 (file)
--- 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 390c243cae76ae3dc4b69472287587eaf15d683b..77b647eccdde632d2c428570ac479a84cb77b76a 100644 (file)
--- 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 047850a8f952c9c0832af396ab4c9ea453406ff3..f4536405eb45fe41d84c26a322e70664d620e6c5 100644 (file)
--- 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 390c243cae76ae3dc4b69472287587eaf15d683b..77b647eccdde632d2c428570ac479a84cb77b76a 100644 (file)
--- 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 ee924c3816d998a8e76bdfdb7ead4c3e1725cf0f..14fdead424110c114a308a3d6fd3068ce1e42b8d 100644 (file)
--- 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 2ecae65f8b14e3e93ce981a1e5fc637e94a74fa6..3d6b5fcc1f21c3966a11d1ccda13f0184b20a693 100644 (file)
--- 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 aa259dbefd3754e4a747eb769fe0631f2d67f9d7..94513650e6856e40d4da1ff531ffb43943367cb1 100644 (file)
--- 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 5e59ccba6247956566140bc677b15286306000cd..a8bb3ffef25db024eec2f63831531bb62ddb7f72 100644 (file)
--- 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 390c243cae76ae3dc4b69472287587eaf15d683b..77b647eccdde632d2c428570ac479a84cb77b76a 100644 (file)
--- 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 99d69155d2156fff688d1fd21af7ac1addcfad98..b9c229013992409b0ac71d05cbcf7958764ed80a 100644 (file)
--- 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 4ad98e1c6ff29c2bd14e68556fa16c0d011e38c2..7fe469cf64bba81cbd9945c02311a8965341d8d5 100644 (file)
--- 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 3076ef402fa655ae652da755d0f9418e090d0abf..fe684378ff0f364d4398f03cdc652e998fcf3b5a 100644 (file)
--- 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 b2824672a941b4cac1ec96f36baf9386ca9f27ae..d3843d48635e7d6be4a0b69156f385248f8d4a14 100644 (file)
--- 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 d4832321b52a0726e7000dab2a3dd24e5822036b..e8e199aa6fb86a98f002a21193b44355be1af938 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -125,11 +125,6 @@
 #define CONFIG_SYS_MEMTEST_END                 0x01000000
 #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 2e0f56f9903a24259c18b58e151206cd02fda941..eac227f498d68df1bef0d5650aaabc3724a49e33 100644 (file)
--- 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 fbfbe27c86e4bf129651f51689ddd7a08fc58910..bc37626ce6705985aa401a58e2f2a69cb15a4f5e 100644 (file)
--- 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