arm: move CONFIG_PREBOOT="usb start" to KConfig
PATCH v4 1/2 arm: move CONFIG_PREBOOT="usb start" to KConfig
This commit moves CONFIG_PREBOOT="usb start" to common/KConfig for all boards also declaring USB_KEYBOARD.
Besides simplifying defconfig files, this also enables support for board-specific CONFIG_PREBOOT for sunxi boards:
commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") intended to support CONFIG_PREBOOT, but include/configs/sunxi-common.h hardcodes preboot as part of internally defined CONSOLE_STDIN_SETTINGS, silently ignoring any board-specific CONFIG_PREBOOT.
Series-Cc: Jagan Teki <[email protected]>
Series-Cc: Lukasz Majewski <[email protected]>
Series-Cc: Andre Przywara <[email protected]>
---
(no changes since v1)
Changes in v4:
- generalize to cover all boards, thanks to Jagan Teki
Changes in v3:
- move default setting to KConfig, thanks to Andre Przywara and Lukasz Majewski
Changes in v2:
- Rephrase commit message to clarify relationship with KConfig entries
--- common/Kconfig | 1 + configs/libretech-ac_defconfig | 1 - configs/libretech-s905d-pc_defconfig | 1 - configs/libretech-s912-pc_defconfig | 1 - configs/pinebook-pro-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/rpi_0_w_defconfig | 1 - configs/rpi_2_defconfig | 1 - configs/rpi_3_32b_defconfig | 1 - configs/rpi_3_b_plus_defconfig | 1 - configs/rpi_3_defconfig | 1 - configs/rpi_defconfig | 1 - configs/seaboard_defconfig | 1 - configs/ventana_defconfig | 1 - include/configs/sunxi-common.h | 1 - 15 files changed, 1 insertion(+), 14 deletions(-)
common/Kconfig +1 -0
@@ -403,6 +403,7 @@ config BOOTCOMMAND config USE_PREBOOT bool "Enable preboot" + default "usb start" if USB_KEYBOARD help When this option is enabled, the existence of the environment variable "preboot" will be checked immediately before starting the
configs/libretech-ac_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_IDENT_STRING=" libretech-ac" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/libretech-s905d-pc_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_IDENT_STRING=" libretech-s905d-pc" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMD_BDI is not set
configs/libretech-s912-pc_defconfig +0 -1
@@ -13,7 +13,6 @@ CONFIG_IDENT_STRING=" libretech-s912-pc" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMD_BDI is not set
configs/pinebook-pro-rk3399_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb" CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/rockpro64-rk3399_defconfig +0 -1
@@ -13,7 +13,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/rpi_0_w_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/rpi_2_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/rpi_3_32b_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/rpi_3_b_plus_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/rpi_3_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/rpi_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
configs/seaboard_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_TEGRA20=y CONFIG_TARGET_SEABOARD=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_FLASH is not set
configs/ventana_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_TEGRA20=y CONFIG_TARGET_VENTANA=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_SYS_PROMPT="Tegra20 (Ventana) # " # CONFIG_CMD_IMI is not set CONFIG_CMD_GPIO=y
include/configs/sunxi-common.h +0 -1
@@ -425,7 +425,6 @@ extern int soft_i2c_gpio_scl;#ifdef CONFIG_USB_KEYBOARD #define CONSOLE_STDIN_SETTINGS \ - "preboot=usb start\0" \ "stdin=serial,usbkbd\0"#else #define CONSOLE_STDIN_SETTINGS \
Signature · 1 line
2.28.0.rc1
PATCH v4 2/2 sun50i: a64: A64-Teres-I board detect builtin keyboard
A64-Teres-I board is a laptop which comes with a builtin keyboard. The keyboard+trackpad controller pauses for 2 seconds at a firmware prompt before loading its HID interface.
U-Boot needs to wait equally long to reliably enable the keyboard.
Series-Cc: Jagan Teki <[email protected]>
Series-Cc: Lukasz Majewski <[email protected]>
Series-Cc: Andre Przywara <[email protected]>
---
(no changes since v1)
Changes in v4:
- (none)
Changes in v3:
- (none)
Changes in v2:
- (none)
--- configs/teres_i_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/teres_i_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=3881949 CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PL7" CONFIG_I2C0_ENABLE=y +CONFIG_PREBOOT="setenv usb_pgood_delay 2000; usb reset" CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-teres-i" CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y
Signature · 1 line
2.28.0.rc1
PATCH v4 1/2 arm: move CONFIG_PREBOOT="usb start" to KConfig
In reply to Jonas SmedegaardHi,
Quoted 89 lines · Jonas Smedegaard
This commit moves
CONFIG_PREBOOT="usbstart" to common/KConfig for all boards also declaringUSB_KEYBOARD.Besides simplifying defconfig files, this also enables support for board-specific
CONFIG_PREBOOTfor sunxi boards:
commit37304aaf60bf("ConvertCONFIG_USE_PREBOOTandCONFIG_PREBOOTtoKconfig") intended to supportCONFIG_PREBOOT, butinclude/configs/sunxi-common.hhardcodes preboot as part of internally definedCONSOLE_STDIN_SETTINGS, silently ignoring any board-specificCONFIG_PREBOOT.Signed-off-by Jonas Smedegaard <[email protected]>Series-Cc: Jagan Teki <[email protected]>
Series-Cc: Lukasz Majewski <[email protected]>
Series-Cc: Andre Przywara <[email protected]>---
(no changes since v1)
Changes in v4:
- generalize to cover all boards, thanks to Jagan TekiChanges in v3:
- move default setting to KConfig, thanks to Andre Przywara and Lukasz MajewskiChanges in v2:
- Rephrase commit message to clarify relationship with KConfig entries--- common/Kconfig | 1 + configs/libretech-ac_defconfig | 1 - configs/libretech-s905d-pc_defconfig | 1 - configs/libretech-s912-pc_defconfig | 1 - configs/pinebook-pro-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/rpi_0_w_defconfig | 1 - configs/rpi_2_defconfig | 1 - configs/rpi_3_32b_defconfig | 1 - configs/rpi_3_b_plus_defconfig | 1 - configs/rpi_3_defconfig | 1 - configs/rpi_defconfig | 1 - configs/seaboard_defconfig | 1 - configs/ventana_defconfig | 1 - include/configs/sunxi-common.h | 1 - 15 files changed, 1 insertion(+), 14 deletions(-)common/Kconfig +1
-0@@ -403,6 +403,7 @@ config BOOTCOMMAND config USE_PREBOOT bool "Enable preboot" + default "usb start" if USB_KEYBOARD help When this option is enabled, the existence of the environment variable "preboot" will be checked immediately before starting theconfigs/libretech-ac_defconfig +0
-1@@ -14,7 +14,6 @@ CONFIG_IDENT_STRING=" libretech-ac" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not setconfigs/libretech-s905d-pc_defconfig +0
-1@@ -14,7 +14,6 @@ CONFIG_IDENT_STRING=" libretech-s905d-pc" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMD_BDI is not setconfigs/libretech-s912-pc_defconfig +0
-0
configs/libretech-s912-pc_defconfig CONFIG_IDENT_STRING=" libretech-s912-pc" · line 18
Quoted 7 lines
configs/libretech-s912-pc_defconfig +0
-1@@ -13,7 +13,6 @@ CONFIG_IDENT_STRING=" libretech-s912-pc" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMD_BDI is not set
For Amlogic libretech amlogic boards.
Neil
PATCH v4 1/2 arm: move CONFIG_PREBOOT="usb start" to KConfig
In reply to Jonas SmedegaardQuoted 11 lines · Jonas Smedegaard
This commit moves
CONFIG_PREBOOT="usbstart" to common/KConfig for all boards also declaringUSB_KEYBOARD.Besides simplifying defconfig files, this also enables support for board-specific
CONFIG_PREBOOTfor sunxi boards:
commit37304aaf60bf("ConvertCONFIG_USE_PREBOOTandCONFIG_PREBOOTtoKconfig") intended to supportCONFIG_PREBOOT, butinclude/configs/sunxi-common.hhardcodes preboot as part of internally definedCONSOLE_STDIN_SETTINGS, silently ignoring any board-specificCONFIG_PREBOOT.
Quoted 5 lines
Signed-off-by Jonas Smedegaard <[email protected]>Series-Cc: Jagan Teki <[email protected]>
Series-Cc: Lukasz Majewski <[email protected]>
Series-Cc: Andre Przywara <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200720/fbd1b7c1/attachment.sig>
PATCH v4 1/2 arm: move CONFIG_PREBOOT="usb start" to KConfig
In reply to Jonas SmedegaardQuoted 40 lines · Jonas Smedegaard
This commit moves
CONFIG_PREBOOT="usbstart" to common/KConfig for all boards also declaringUSB_KEYBOARD.Besides simplifying defconfig files, this also enables support for board-specific
CONFIG_PREBOOTfor sunxi boards:
commit37304aaf60bf("ConvertCONFIG_USE_PREBOOTandCONFIG_PREBOOTtoKconfig") intended to supportCONFIG_PREBOOT, butinclude/configs/sunxi-common.hhardcodes preboot as part of internally definedCONSOLE_STDIN_SETTINGS, silently ignoring any board-specificCONFIG_PREBOOT.Signed-off-by Jonas Smedegaard <[email protected]>Series-Cc: Jagan Teki <[email protected]>
Series-Cc: Lukasz Majewski <[email protected]>
Series-Cc: Andre Przywara <[email protected]>---
(no changes since v1)
Changes in v4:
- generalize to cover all boards, thanks to Jagan TekiChanges in v3:
- move default setting to KConfig, thanks to Andre Przywara and Lukasz MajewskiChanges in v2:
- Rephrase commit message to clarify relationship with KConfig entries--- common/Kconfig | 1 + configs/libretech-ac_defconfig | 1 - configs/libretech-s905d-pc_defconfig | 1 - configs/libretech-s912-pc_defconfig | 1 - configs/pinebook-pro-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/rpi_0_w_defconfig | 1 - configs/rpi_2_defconfig | 1 -
Quoted 8 lines
configs/rpi_3_32b_defconfig | 1 - configs/rpi_3_b_plus_defconfig | 1 - configs/rpi_3_defconfig | 1 - configs/rpi_defconfig | 1 - configs/seaboard_defconfig | 1 - configs/ventana_defconfig | 1 - include/configs/sunxi-common.h | 1 - 15 files changed, 1 insertion(+), 14 deletions(-)