Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b87ca80b9b1825b44341aa4bcd28c26a7860fd18

Authored by Simon Glass
Committed by Tom Rini
1 parent 5ecf8c6618
Exists in v2017.01-smarct4x and in 26 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 47 changed files with 37 additions and 30 deletions Side-by-side Diff

... ... @@ -1693,12 +1693,6 @@
1693 1693 here, since it is cheaper to change data cache settings on
1694 1694 a per-section basis.
1695 1695  
1696   - CONFIG_CONSOLE_SCROLL_LINES
1697   -
1698   - When the console need to be scrolled, this is the number of
1699   - lines to scroll by. It defaults to 1. Increasing this makes
1700   - the console jump but can help speed up operation when scrolling
1701   - is slow.
1702 1696  
1703 1697 CONFIG_LCD_ROTATION
1704 1698  
configs/bayleybay_defconfig
Diff comments   View file @ b87ca80
... ... @@ -58,5 +58,6 @@
58 58 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
59 59 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
60 60 CONFIG_CFB_CONSOLE=y
  61 +CONFIG_CONSOLE_SCROLL_LINES=5
61 62 CONFIG_USE_PRIVATE_LIBGCC=y
configs/chromebook_jerry_defconfig
Diff comments   View file @ b87ca80
... ... @@ -76,6 +76,7 @@
76 76 CONFIG_DM_VIDEO=y
77 77 CONFIG_DISPLAY=y
78 78 CONFIG_VIDEO_ROCKCHIP=y
  79 +CONFIG_CONSOLE_SCROLL_LINES=10
79 80 CONFIG_USE_TINY_PRINTF=y
80 81 CONFIG_CMD_DHRYSTONE=y
81 82 CONFIG_ERRNO_STR=y
configs/chromebook_link_defconfig
Diff comments   View file @ b87ca80
... ... @@ -62,6 +62,7 @@
62 62 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
63 63 CONFIG_VIDEO_IVYBRIDGE_IGD=y
64 64 CONFIG_CFB_CONSOLE=y
  65 +CONFIG_CONSOLE_SCROLL_LINES=5
65 66 CONFIG_USE_PRIVATE_LIBGCC=y
66 67 CONFIG_TPM=y
configs/chromebook_samus_defconfig
Diff comments   View file @ b87ca80
... ... @@ -59,6 +59,7 @@
59 59 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
60 60 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
61 61 CONFIG_VIDEO_BROADWELL_IGD=y
  62 +CONFIG_CONSOLE_SCROLL_LINES=5
62 63 CONFIG_USE_PRIVATE_LIBGCC=y
63 64 CONFIG_TPM=y
configs/chromebox_panther_defconfig
Diff comments   View file @ b87ca80
... ... @@ -53,6 +53,7 @@
53 53 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
54 54 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
55 55 CONFIG_CFB_CONSOLE=y
  56 +CONFIG_CONSOLE_SCROLL_LINES=5
56 57 CONFIG_USE_PRIVATE_LIBGCC=y
57 58 CONFIG_TPM=y
configs/colibri_t20_defconfig
Diff comments   View file @ b87ca80
... ... @@ -54,4 +54,5 @@
54 54 CONFIG_G_DNL_PRODUCT_NUM=0x701a
55 55 CONFIG_DM_VIDEO=y
56 56 CONFIG_VIDEO_TEGRA20=y
  57 +CONFIG_CONSOLE_SCROLL_LINES=10
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
Diff comments   View file @ b87ca80
... ... @@ -66,5 +66,6 @@
66 66 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
67 67 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
68 68 CONFIG_CFB_CONSOLE=y
  69 +CONFIG_CONSOLE_SCROLL_LINES=5
69 70 CONFIG_USE_PRIVATE_LIBGCC=y
configs/conga-qeval20-qa3-e3845_defconfig
Diff comments   View file @ b87ca80
... ... @@ -65,5 +65,6 @@
65 65 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
66 66 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
67 67 CONFIG_CFB_CONSOLE=y
  68 +CONFIG_CONSOLE_SCROLL_LINES=5
68 69 CONFIG_USE_PRIVATE_LIBGCC=y
configs/coreboot-x86_defconfig
Diff comments   View file @ b87ca80
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_USB_STORAGE=y
43 43 CONFIG_DM_VIDEO=y
44 44 CONFIG_VIDEO_COREBOOT=y
  45 +CONFIG_CONSOLE_SCROLL_LINES=5
45 46 CONFIG_USE_PRIVATE_LIBGCC=y
46 47 CONFIG_TPM=y
configs/crownbay_defconfig
Diff comments   View file @ b87ca80
... ... @@ -51,5 +51,6 @@
51 51 CONFIG_VIDEO_VESA=y
52 52 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
53 53 CONFIG_CFB_CONSOLE=y
  54 +CONFIG_CONSOLE_SCROLL_LINES=5
54 55 CONFIG_USE_PRIVATE_LIBGCC=y
configs/dfi-bt700-q7x-151_defconfig
Diff comments   View file @ b87ca80
... ... @@ -63,5 +63,6 @@
63 63 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
64 64 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
65 65 CONFIG_CFB_CONSOLE=y
  66 +CONFIG_CONSOLE_SCROLL_LINES=5
66 67 CONFIG_USE_PRIVATE_LIBGCC=y
configs/firefly-rk3288_defconfig
Diff comments   View file @ b87ca80
... ... @@ -66,6 +66,7 @@
66 66 CONFIG_DM_VIDEO=y
67 67 CONFIG_DISPLAY=y
68 68 CONFIG_VIDEO_ROCKCHIP=y
  69 +CONFIG_CONSOLE_SCROLL_LINES=10
69 70 CONFIG_USE_TINY_PRINTF=y
70 71 CONFIG_CMD_DHRYSTONE=y
71 72 CONFIG_ERRNO_STR=y
configs/harmony_defconfig
Diff comments   View file @ b87ca80
... ... @@ -41,4 +41,5 @@
41 41 CONFIG_USB_STORAGE=y
42 42 CONFIG_DM_VIDEO=y
43 43 CONFIG_VIDEO_TEGRA20=y
  44 +CONFIG_CONSOLE_SCROLL_LINES=10
configs/minnowmax_defconfig
Diff comments   View file @ b87ca80
... ... @@ -62,5 +62,6 @@
62 62 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
63 63 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
64 64 CONFIG_CFB_CONSOLE=y
  65 +CONFIG_CONSOLE_SCROLL_LINES=5
65 66 CONFIG_USE_PRIVATE_LIBGCC=y
configs/paz00_defconfig
Diff comments   View file @ b87ca80
... ... @@ -39,4 +39,5 @@
39 39 CONFIG_USB_STORAGE=y
40 40 CONFIG_DM_VIDEO=y
41 41 CONFIG_VIDEO_TEGRA20=y
  42 +CONFIG_CONSOLE_SCROLL_LINES=10
configs/qemu-x86_defconfig
Diff comments   View file @ b87ca80
... ... @@ -49,5 +49,6 @@
49 49 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
50 50 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
51 51 CONFIG_CFB_CONSOLE=y
  52 +CONFIG_CONSOLE_SCROLL_LINES=5
52 53 CONFIG_USE_PRIVATE_LIBGCC=y
configs/qemu-x86_efi_payload32_defconfig
Diff comments   View file @ b87ca80
... ... @@ -46,6 +46,7 @@
46 46 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
47 47 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
48 48 CONFIG_CFB_CONSOLE=y
  49 +CONFIG_CONSOLE_SCROLL_LINES=5
49 50 CONFIG_USE_PRIVATE_LIBGCC=y
50 51 CONFIG_EFI=y
51 52 CONFIG_EFI_STUB=y
configs/qemu-x86_efi_payload64_defconfig
Diff comments   View file @ b87ca80
... ... @@ -46,6 +46,7 @@
46 46 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
47 47 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
48 48 CONFIG_CFB_CONSOLE=y
  49 +CONFIG_CONSOLE_SCROLL_LINES=5
49 50 CONFIG_USE_PRIVATE_LIBGCC=y
50 51 CONFIG_EFI=y
51 52 CONFIG_EFI_STUB=y
configs/rock2_defconfig
Diff comments   View file @ b87ca80
... ... @@ -64,6 +64,7 @@
64 64 CONFIG_DM_VIDEO=y
65 65 CONFIG_DISPLAY=y
66 66 CONFIG_VIDEO_ROCKCHIP=y
  67 +CONFIG_CONSOLE_SCROLL_LINES=10
67 68 CONFIG_USE_TINY_PRINTF=y
68 69 CONFIG_CMD_DHRYSTONE=y
69 70 CONFIG_ERRNO_STR=y
configs/rpi_2_defconfig
Diff comments   View file @ b87ca80
... ... @@ -22,6 +22,7 @@
22 22 CONFIG_CMD_FS_GENERIC=y
23 23 CONFIG_USB=y
24 24 CONFIG_USB_STORAGE=y
  25 +CONFIG_CONSOLE_SCROLL_LINES=10
25 26 CONFIG_LCD=y
26 27 CONFIG_PHYS_TO_BUS=y
27 28 CONFIG_OF_LIBFDT=y
configs/rpi_3_32b_defconfig
Diff comments   View file @ b87ca80
... ... @@ -24,6 +24,7 @@
24 24 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
25 25 CONFIG_USB=y
26 26 CONFIG_USB_STORAGE=y
  27 +CONFIG_CONSOLE_SCROLL_LINES=10
27 28 CONFIG_LCD=y
28 29 CONFIG_PHYS_TO_BUS=y
29 30 CONFIG_OF_LIBFDT=y
configs/rpi_3_defconfig
Diff comments   View file @ b87ca80
... ... @@ -23,6 +23,7 @@
23 23 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
24 24 CONFIG_USB=y
25 25 CONFIG_USB_STORAGE=y
  26 +CONFIG_CONSOLE_SCROLL_LINES=10
26 27 CONFIG_LCD=y
27 28 CONFIG_PHYS_TO_BUS=y
28 29 CONFIG_OF_LIBFDT=y
configs/rpi_defconfig
Diff comments   View file @ b87ca80
... ... @@ -22,6 +22,7 @@
22 22 CONFIG_CMD_FS_GENERIC=y
23 23 CONFIG_USB=y
24 24 CONFIG_USB_STORAGE=y
  25 +CONFIG_CONSOLE_SCROLL_LINES=10
25 26 CONFIG_LCD=y
26 27 CONFIG_PHYS_TO_BUS=y
27 28 CONFIG_OF_LIBFDT=y
configs/seaboard_defconfig
Diff comments   View file @ b87ca80
... ... @@ -42,4 +42,5 @@
42 42 CONFIG_USB_STORAGE=y
43 43 CONFIG_DM_VIDEO=y
44 44 CONFIG_VIDEO_TEGRA20=y
  45 +CONFIG_CONSOLE_SCROLL_LINES=10
configs/som-db5800-som-6867_defconfig
Diff comments   View file @ b87ca80
... ... @@ -60,5 +60,6 @@
60 60 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
61 61 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
62 62 CONFIG_CFB_CONSOLE=y
  63 +CONFIG_CONSOLE_SCROLL_LINES=5
63 64 CONFIG_USE_PRIVATE_LIBGCC=y
configs/theadorable-x86-dfi-bt700_defconfig
Diff comments   View file @ b87ca80
... ... @@ -60,5 +60,6 @@
60 60 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
61 61 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
62 62 CONFIG_CFB_CONSOLE=y
  63 +CONFIG_CONSOLE_SCROLL_LINES=5
63 64 CONFIG_USE_PRIVATE_LIBGCC=y
configs/ventana_defconfig
Diff comments   View file @ b87ca80
... ... @@ -41,4 +41,5 @@
41 41 CONFIG_USB_STORAGE=y
42 42 CONFIG_DM_VIDEO=y
43 43 CONFIG_VIDEO_TEGRA20=y
  44 +CONFIG_CONSOLE_SCROLL_LINES=10
drivers/video/Kconfig
Diff comments   View file @ b87ca80
... ... @@ -523,6 +523,16 @@
523 523 each line of the display. The function should return the string,
524 524 which can be empty if there is nothing to display for that line.
525 525  
  526 +config CONSOLE_SCROLL_LINES
  527 + int "Number of lines to scroll the console by"
  528 + depends on CFB_CONSOLE || DM_VIDEO || LCD
  529 + default 1
  530 + help
  531 + When the console need to be scrolled, this is the number of
  532 + lines to scroll by. It defaults to 1. Increasing this makes the
  533 + console jump but can help speed up operation when scrolling
  534 + is slow.
  535 +
526 536 config VIDEO_CT69000
527 537 bool "Enable Chips & Technologies 69000 video driver"
528 538 depends on VIDEO
include/configs/chromebook_jerry.h
Diff comments   View file @ b87ca80
... ... @@ -23,7 +23,6 @@
23 23 #define CONFIG_KEYBOARD
24 24  
25 25 #define CONFIG_SYS_WHITE_ON_BLACK
26   -#define CONFIG_CONSOLE_SCROLL_LINES 10
27 26  
28 27 #endif
include/configs/colibri_pxa270.h
Diff comments   View file @ b87ca80
... ... @@ -67,7 +67,6 @@
67 67 #define CONFIG_PXA_LCD
68 68 #define CONFIG_PXA_VGA
69 69 #define CONFIG_SYS_WHITE_ON_BLACK
70   -#define CONFIG_CONSOLE_SCROLL_LINES 10
71 70 #define CONFIG_CMD_BMP
72 71 #define CONFIG_LCD_LOGO
73 72 #endif
include/configs/colibri_t20.h
Diff comments   View file @ b87ca80
... ... @@ -47,7 +47,6 @@
47 47  
48 48 /* LCD support */
49 49 #define CONFIG_SYS_WHITE_ON_BLACK
50   -#define CONFIG_CONSOLE_SCROLL_LINES 10
51 50 #define CONFIG_CMD_BMP
52 51 #define CONFIG_LCD_LOGO
53 52  
include/configs/evb_rk3288.h
Diff comments   View file @ b87ca80
... ... @@ -19,7 +19,6 @@
19 19 #define CONFIG_ENV_OFFSET (96 * 1024)
20 20  
21 21 #define CONFIG_SYS_WHITE_ON_BLACK
22   -#define CONFIG_CONSOLE_SCROLL_LINES 10
23 22  
24 23 #endif
include/configs/evb_rk3399.h
Diff comments   View file @ b87ca80
... ... @@ -21,7 +21,6 @@
21 21 #define SDRAM_BANK_SIZE (2UL << 30)
22 22  
23 23 #define CONFIG_SYS_WHITE_ON_BLACK
24   -#define CONFIG_CONSOLE_SCROLL_LINES 10
25 24  
26 25 #endif
include/configs/fennec_rk3288.h
Diff comments   View file @ b87ca80
... ... @@ -19,7 +19,6 @@
19 19 #define CONFIG_ENV_OFFSET (96 * 1024)
20 20  
21 21 #define CONFIG_SYS_WHITE_ON_BLACK
22   -#define CONFIG_CONSOLE_SCROLL_LINES 10
23 22  
24 23 #endif
include/configs/firefly-rk3288.h
Diff comments   View file @ b87ca80
... ... @@ -23,7 +23,6 @@
23 23 #define CONFIG_ENV_OFFSET (96 * 1024)
24 24  
25 25 #define CONFIG_SYS_WHITE_ON_BLACK
26   -#define CONFIG_CONSOLE_SCROLL_LINES 10
27 26  
28 27 #endif
include/configs/harmony.h
Diff comments   View file @ b87ca80
... ... @@ -54,7 +54,6 @@
54 54  
55 55 /* LCD support */
56 56 #define CONFIG_SYS_WHITE_ON_BLACK
57   -#define CONFIG_CONSOLE_SCROLL_LINES 10
58 57  
59 58 #include "tegra-common-post.h"
60 59  
include/configs/miniarm_rk3288.h
Diff comments   View file @ b87ca80
... ... @@ -24,7 +24,6 @@
24 24 #define CONFIG_ENV_OFFSET (96 * 1024)
25 25  
26 26 #define CONFIG_SYS_WHITE_ON_BLACK
27   -#define CONFIG_CONSOLE_SCROLL_LINES 10
28 27  
29 28 #endif
include/configs/paz00.h
Diff comments   View file @ b87ca80
... ... @@ -45,7 +45,6 @@
45 45  
46 46 /* LCD support */
47 47 #define CONFIG_SYS_WHITE_ON_BLACK
48   -#define CONFIG_CONSOLE_SCROLL_LINES 10
49 48  
50 49 #include "tegra-common-post.h"
51 50  
include/configs/popmetal_rk3288.h
Diff comments   View file @ b87ca80
... ... @@ -19,7 +19,6 @@
19 19 #define CONFIG_ENV_OFFSET (96 * 1024)
20 20  
21 21 #define CONFIG_SYS_WHITE_ON_BLACK
22   -#define CONFIG_CONSOLE_SCROLL_LINES 10
23 22  
24 23 #endif
include/configs/rock2.h
Diff comments   View file @ b87ca80
... ... @@ -32,7 +32,6 @@
32 32 #endif
33 33  
34 34 #define CONFIG_SYS_WHITE_ON_BLACK
35   -#define CONFIG_CONSOLE_SCROLL_LINES 10
36 35  
37 36 #endif
include/configs/rpi.h
Diff comments   View file @ b87ca80
... ... @@ -81,7 +81,6 @@
81 81 #define CONFIG_FB_ADDR 0
82 82 #define CONFIG_VIDEO_BCM2835
83 83 #define CONFIG_SYS_WHITE_ON_BLACK
84   -#define CONFIG_CONSOLE_SCROLL_LINES 10
85 84  
86 85 /* SD/MMC configuration */
87 86 #define CONFIG_GENERIC_MMC
include/configs/seaboard.h
Diff comments   View file @ b87ca80
... ... @@ -61,7 +61,6 @@
61 61  
62 62 /* LCD support */
63 63 #define CONFIG_SYS_WHITE_ON_BLACK
64   -#define CONFIG_CONSOLE_SCROLL_LINES 10
65 64  
66 65 /* NAND support */
67 66 #define CONFIG_CMD_NAND
include/configs/ventana.h
Diff comments   View file @ b87ca80
... ... @@ -46,7 +46,6 @@
46 46  
47 47 /* LCD support */
48 48 #define CONFIG_SYS_WHITE_ON_BLACK
49   -#define CONFIG_CONSOLE_SCROLL_LINES 10
50 49  
51 50 #include "tegra-common-post.h"
52 51  
include/configs/x86-common.h
Diff comments   View file @ b87ca80
... ... @@ -126,11 +126,6 @@
126 126 #define CONFIG_SYS_LOAD_ADDR 0x20000000
127 127  
128 128 /*-----------------------------------------------------------------------
129   - * Video Configuration
130   - */
131   -#define CONFIG_CONSOLE_SCROLL_LINES 5
132   -
133   -/*-----------------------------------------------------------------------
134 129 * CPU Features
135 130 */
136 131  
include/lcd_console.h
Diff comments   View file @ b87ca80
... ... @@ -5,9 +5,6 @@
5 5 */
6 6  
7 7 /* By default we scroll by a single line */
8   -#ifndef CONFIG_CONSOLE_SCROLL_LINES
9   -#define CONFIG_CONSOLE_SCROLL_LINES 1
10   -#endif
11 8  
12 9 struct console_t {
13 10 short curr_col, curr_row;
scripts/config_whitelist.txt
Diff comments   View file @ b87ca80
... ... @@ -671,7 +671,6 @@
671 671 CONFIG_COMMON_ENV_UBI
672 672 CONFIG_COMPACT_FLASH
673 673 CONFIG_COMPAT
674   -CONFIG_CONSOLE_SCROLL_LINES
675 674 CONFIG_CONS_EXTC_PINSEL
676 675 CONFIG_CONS_EXTC_RATE
677 676 CONFIG_CONS_NONE