Define default CONFIG_PREBOOT with right config option
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
The 44758771ee commit removes CONFIG_PREBOOT but actually sets the USE_PREBOOT Kconfig option which isn't CONFIG_PREBOOT and is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB bus for.
--- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
common/Kconfig +1 -1
@@ -403,7 +403,6 @@ 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
@@ -417,6 +416,7 @@ config USE_PREBOOT config PREBOOT string "preboot default value" depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE + default "usb start" if USB_KEYBOARD || USB_STORAGE default "" help This is the default of "preboot" environment variable.
Signature · 1 line
2.26.2
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
Quoted 10 lines · Peter Robinson
The
44758771eecommit removesCONFIG_PREBOOTbut actually sets theUSE_PREBOOTKconfigoption which isn'tCONFIG_PREBOOTand is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB bus for.Fixes 44758771ee ("arm: move CONFIG_PREBOOT="usb start" to KConfig")Signed-off-by Peter Robinson <[email protected]>Cc Jonas Smedegaard <[email protected]>Cc Neil Armstrong <[email protected]>
Applied to u-boot/master, thanks!
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/20200930/f1305287/attachment.sig>
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
In reply to Peter RobinsonQuoted 7 lines · Peter Robinson
The
44758771eecommit removesCONFIG_PREBOOTbut actually sets theUSE_PREBOOTKconfigoption which isn'tCONFIG_PREBOOTand is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB bus for.
Quoted 8 lines
Fixes 44758771ee ("arm: move CONFIG_PREBOOT="usb start" to KConfig")Signed-off-by Peter Robinson <[email protected]>Cc Jonas Smedegaard <[email protected]>Cc Neil Armstrong <[email protected]>--- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
In reply to Peter RobinsonHi,
Quoted 37 lines
From: U-Boot <[email protected]> On Behalf Of Peter Robinson
Sent: mardi 29 septembre 2020 11:48The
44758771eecommit removesCONFIG_PREBOOTbut actually sets theUSE_PREBOOTKconfigoption which isn'tCONFIG_PREBOOTand is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB bus for.Fixes 44758771ee ("arm: move CONFIG_PREBOOT="usb start" to KConfig")Signed-off-by Peter Robinson <[email protected]>Cc Jonas Smedegaard <[email protected]>Cc Neil Armstrong <[email protected]>--- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/Kconfig index b1934b3a9c..9c20a9738e renamed from common/Kconfig +0
-0100644
common/Kconfig +0
-1@@ -403,7 +403,6 @@ 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 @@ -417,6 +416,7 @@ config
USE_PREBOOTconfig PREBOOTcommon/Kconfig +1
-1string "preboot default value" depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE + default "usb start" if USB_KEYBOARD || USB_STORAGE default "" help This is the default of "preboot" environment variable. --
Quoted 1 line
2.26.2
For information, this patch cause unexpected 'usb start' on STM32MP15x boards and slow down the start-up in realease v2020.10.
For me it is unexpected because
- USB keyboard is not activated
- USB storage is activated but USB boot is not supported (not managed by distro boot command)
I sent a patch [1] for the associated defconfig but I'm afraid that other boards are impacted.
As the USB storage boot initialization is correctly managed by distro boot command 'usb_boot' (defined in include/config_distro_bootcmd.h, it already include 'usb start'), I think that the USB_STORAGE test should be removed or limited by !DISTRO_DEFAULTS.
[1] = "configs: stm32mp: force empty PREBOOT"
http://patchwork.ozlabs.org/project/uboot/patch/20201007081020.30635-1-patrick.delaunay at st.com/
Regards
Patrick
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
Hi Patrick,
Quoted 49 lines · Patrick DELAUNAY
Hi,
Quoted 30 lines
From: U-Boot <[email protected]> On Behalf Of Peter Robinson
Sent: mardi 29 septembre 2020 11:48The
44758771eecommit removesCONFIG_PREBOOTbut actually sets theUSE_PREBOOTKconfigoption which isn'tCONFIG_PREBOOTand is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB bus for.Fixes 44758771ee ("arm: move CONFIG_PREBOOT="usb start" to KConfig")Signed-off-by Peter Robinson <[email protected]>Cc Jonas Smedegaard <[email protected]>Cc Neil Armstrong <[email protected]>--- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/Kconfig index b1934b3a9c..9c20a9738e renamed from common/Kconfig +0
-0100644
common/Kconfig +0
-1@@ -403,7 +403,6 @@ 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 @@ -417,6 +416,7 @@ config
USE_PREBOOTconfig PREBOOTQuoted 8 lines
string "preboot default value"
depends onUSE_PREBOOT&& !USE_DEFAULT_ENV_FILE
+ default "usb start" ifUSB_KEYBOARD||USB_STORAGE
default ""
help
This is the default of "preboot" environment variable.
--
2.26.2For information, this patch cause unexpected 'usb start' on STM32MP15x boards and slow down the start-up in realease v2020.10.
For me it is unexpected because
- USB keyboard is not activated
- USB storage is activated but USB boot is not supported (not managed by distro boot command)
Quoted 5 lines
I sent a patch [1] for the associated defconfig but I'm afraid that other boards are impacted.
As the USB storage boot initialization is correctly managed by distro boot command '
usb_boot' (defined ininclude/config_distro_bootcmd.h, it already include 'usb start'), I think that theUSB_STORAGEtest should be removed or limited by !DISTRO_DEFAULTS.
Perhaps PREBOOT should depend on USE_PREBOOT?
Regards,
Simon
Quoted 4 lines
[1] = "configs: stm32mp: force empty PREBOOT"
http://patchwork.ozlabs.org/project/uboot/patch/20201007081020.30635-1-patrick.delaunay at st.com/
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
Quoted 52 lines · Simon Glass
Hi Patrick,
Quoted 49 lines · Patrick DELAUNAY
Hi,
Quoted 30 lines
From: U-Boot <[email protected]> On Behalf Of Peter Robinson
Sent: mardi 29 septembre 2020 11:48The
44758771eecommit removesCONFIG_PREBOOTbut actually sets theUSE_PREBOOTKconfigoption which isn'tCONFIG_PREBOOTand is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB bus for.Fixes 44758771ee ("arm: move CONFIG_PREBOOT="usb start" to KConfig")Signed-off-by Peter Robinson <[email protected]>Cc Jonas Smedegaard <[email protected]>Cc Neil Armstrong <[email protected]>--- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/Kconfig index b1934b3a9c..9c20a9738e renamed from common/Kconfig +0
-0100644
common/Kconfig +0
-1@@ -403,7 +403,6 @@ 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 @@ -417,6 +416,7 @@ config
USE_PREBOOTconfig PREBOOTQuoted 8 lines
string "preboot default value"
depends onUSE_PREBOOT&& !USE_DEFAULT_ENV_FILE
+ default "usb start" ifUSB_KEYBOARD||USB_STORAGE
default ""
help
This is the default of "preboot" environment variable.
--
2.26.2For information, this patch cause unexpected 'usb start' on STM32MP15x boards and slow down the start-up in realease v2020.10.
For me it is unexpected because
- USB keyboard is not activated
- USB storage is activated but USB boot is not supported (not managed by distro boot command)
Quoted 7 lines
Quoted 5 lines
I sent a patch [1] for the associated defconfig but I'm afraid that other boards are impacted.
As the USB storage boot initialization is correctly managed by distro boot command '
usb_boot' (defined ininclude/config_distro_bootcmd.h, it already include 'usb start'), I think that theUSB_STORAGEtest should be removed or limited by !DISTRO_DEFAULTS.Perhaps PREBOOT should depend on
USE_PREBOOT?
It does. And ARCH_STM32MP does "imply USE_PREBOOT" which is maybe the root problem?
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/20201007/8790a9ed/attachment.sig>
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
Hi Simon and Tom
Quoted 70 lines
From: Tom Rini <[email protected]>
Sent: mercredi 7 octobre 2020 17:45Quoted 3 lines · Simon Glass
Hi Patrick,
On Wed, 7 Oct 2020 at 02:38, Patrick DELAUNAY <[email protected]>
Quoted 7 lines · wrote:
Quoted 7 lines
Hi,
Quoted 4 lines
From: U-Boot <[email protected]> On Behalf Of Peter Robinson
Sent: mardi 29 septembre 2020 11:48Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
The
44758771eecommit removesCONFIG_PREBOOTbut actually sets theUSE_PREBOOTKconfigoption which isn'tCONFIG_PREBOOTand is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USBbus for.
Quoted 37 lines
Quoted 37 lines
Quoted 25 lines
Fixes 44758771ee ("arm: move CONFIG_PREBOOT="usb start" toKConfig")
Signed-off-by Peter Robinson <[email protected]>Cc Jonas Smedegaard <[email protected]>Cc Neil Armstrong <[email protected]>--- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/Kconfig index renamed from common/Kconfig +0
-0
b1934b3a9c..9c20a9738e
100644common/Kconfig +0
-1@@ -403,7 +403,6 @@ 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 beforestarting the @@ -
417,6 +416,7 @@ configUSE_PREBOOTconfig PREBOOTQuoted 8 lines
string "preboot default value"
depends onUSE_PREBOOT&& !USE_DEFAULT_ENV_FILE
+ default "usb start" ifUSB_KEYBOARD||USB_STORAGE
default ""
help
This is the default of "preboot" environment variable.
--
2.26.2For information, this patch cause unexpected 'usb start' on STM32MP15x boards and slow down the start-up in realease v2020.10.
Quoted 6 lines
Quoted 6 lines
For me it is unexpected because
- USB keyboard is not activated
- USB storage is activated but USB boot is not supported (not managed by distro boot command)I sent a patch [1] for the associated defconfig but I'm afraid that other boards
are impacted.
Quoted 2 lines
Quoted 2 lines
As the USB storage boot initialization is correctly managed by distro boot
command '
usb_boot'Quoted 2 lines
Quoted 2 lines
(defined in
include/config_distro_bootcmd.h, it already include 'usb start'), I think that theUSB_STORAGEtest should be removed or limited by
Quoted 8 lines
!DISTRO_DEFAULTS.
Quoted 2 lines
Perhaps PREBOOT should depend on
USE_PREBOOT?It does. And
ARCH_STM32MPdoes "implyUSE_PREBOOT" which is maybe the root problem?
--
Tom
I activate CONFIG_USE_PREBOOT to handle the "preboot" variable in common/main.c::main_loop()
if (IS_ENABLED(CONFIG_USE_PREBOOT)) run_preboot_environment_command();
In my case the preboot variable is dynamically build in arch/arm/mach-stm32mp/cpu.c::setup_boot_mode()
to handle the reboot reason provided by Linux kernel in a TAMPER register
And it is why I activate the USE_PREBOOT with imply in mach-stm32mp Kconfig.
So the expected configuration for me is
- CONFIG_USE_PREBOOT=y => variable preboot is handle
- CONFIG_PREBOOT="" => default value of variable
After this patch, the value CONFIG_PREBOOT change because CONFIG_ USB_STORAGE is also activated in stm32mp15 defconfig.
Anyway I will solve the issue for my defconfig with [1] But I am still confuse with this this patch:
1/ I understood why preboot = "usb start" when the USB keyboard is activated
keyboard can be use to interrupt the boot and enter new command,
2/ I don't understood why it is need for USB storage by default....
'usb start' can't be handle in bootcmd, as it is done in distro bootcmd ?
Why usb device had to be available before the bootcmd is executed in main loop ?
I don't found boot use-case where it is needed when distro bootcmd is used...
I just ask some clarification on this part:
+ default "usb start" iUSB_STORAGE
,
And raise a potential issue for other platforms with
- CONFIG_USB_STORAGE=y
- CONFIG_USE_PREBOOT=y
- CONFIG_PREBOOT not defined
- preboot build dynamically:
arch/arm/mach-imx/mx6/opos6ul.c:68: env_set("preboot", "");arch/arm/mach-rockchip/boot_mode.c:98: env_set("preboot", "setenv preboot; fastboot usb0");arch/arm/mach-rockchip/boot_mode.c:102: env_set("preboot", "setenv preboot; ums mmc 0");board/syteco/zmx25/zmx25.c:162: env_set("preboot", "run gs_slow_boot");board/syteco/zmx25/zmx25.c:164: env_set("preboot", "run gs_fast_boot");board/boundary/nitrogen6x/nitrogen6x.c:966: env_set("preboot", cmd);board/rockchip/kylin_rk3036/kylin_rk3036.c:46: env_set("preboot", "setenv preboot; fastboot usb0");
[1] = "configs: stm32mp: force empty PREBOOT"
http://patchwork.ozlabs.org/project/uboot/patch/20201007081020.30635-1-patrick.delaunay at st.com/
Regards
Patrick
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
In reply to Patrick DELAUNAYQuoted 48 lines · Patrick DELAUNAY
Hi,
Quoted 37 lines
From: U-Boot <[email protected]> On Behalf Of Peter Robinson
Sent: mardi 29 septembre 2020 11:48The
44758771eecommit removesCONFIG_PREBOOTbut actually sets theUSE_PREBOOTKconfigoption which isn'tCONFIG_PREBOOTand is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB bus for.Fixes 44758771ee ("arm: move CONFIG_PREBOOT="usb start" to KConfig")Signed-off-by Peter Robinson <[email protected]>Cc Jonas Smedegaard <[email protected]>Cc Neil Armstrong <[email protected]>--- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/Kconfig index b1934b3a9c..9c20a9738e renamed from common/Kconfig +0
-0100644
common/Kconfig +0
-1@@ -403,7 +403,6 @@ 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 @@ -417,6 +416,7 @@ config
USE_PREBOOTconfig PREBOOTcommon/Kconfig +1
-1string "preboot default value" depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE + default "usb start" if USB_KEYBOARD || USB_STORAGE default "" help This is the default of "preboot" environment variable. --Quoted 1 line
2.26.2
For information, this patch cause unexpected 'usb start' on STM32MP15x boards and slow down the start-up in realease v2020.10.
For me it is unexpected because
- USB keyboard is not activated
- USB storage is activated but USB boot is not supported (not managed by distro boot command)
Quoted 8 lines
I sent a patch [1] for the associated defconfig but I'm afraid that other boards are impacted.
As the USB storage boot initialization is correctly managed by distro boot command '
usb_boot' (defined ininclude/config_distro_bootcmd.h, it already include 'usb start'), I think that theUSB_STORAGEtest should be removed or limited by !DISTRO_DEFAULTS.[1] = "configs: stm32mp: force empty PREBOOT"
http://patchwork.ozlabs.org/project/uboot/patch/20201007081020.30635-1-patrick.delaunay at st.com/
Re-re-reading everything and this is a helpful explanation. This commit is wrong as it did more than just fix 44758771ee, which put the default in the wrong place, but added new logic that shouldn't be required.
Patrick, can you please send a new patch to fix this commit and in turn NOT also default usb start on USB_STORAGE, only USB_KEYBOARD? Thanks!
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/20201009/58a692ff/attachment.sig>
PATCH 1/1 Define default CONFIG_PREBOOT with right config option
Hi Tom
Quoted 71 lines
From: Tom Rini <[email protected]>
Sent: vendredi 9 octobre 2020 15:18Quoted 11 lines · Patrick DELAUNAY
Hi,
Quoted 9 lines
From: U-Boot <[email protected]> On Behalf Of Peter Robinson
Sent: mardi 29 septembre 2020 11:48The
44758771eecommit removesCONFIG_PREBOOTbut actually sets theUSE_PREBOOTKconfigoption which isn'tCONFIG_PREBOOTand is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB busfor.
Quoted 37 lines
Quoted 32 lines
Fixes 44758771ee ("arm: move CONFIG_PREBOOT="usb start" toKConfig")
Signed-off-by Peter Robinson <[email protected]>Cc Jonas Smedegaard <[email protected]>Cc Neil Armstrong <[email protected]>--- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/Kconfig index renamed from common/Kconfig +0
-0
b1934b3a9c..9c20a9738e
100644common/Kconfig +0
-1@@ -403,7 +403,6 @@ 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 startingthe @@ -
417,6 +416,7 @@ configUSE_PREBOOTconfig PREBOOTcommon/Kconfig +1
-1string "preboot default value" depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE + default "usb start" if USB_KEYBOARD || USB_STORAGE default "" help This is the default of "preboot" environment variable. --Quoted 1 line
2.26.2
For information, this patch cause unexpected 'usb start' on STM32MP15x boards and slow down the start-up in realease v2020.10.
Quoted 6 lines
For me it is unexpected because
- USB keyboard is not activated
- USB storage is activated but USB boot is not supported (not managed by distro boot command)I sent a patch [1] for the associated defconfig but I'm afraid that other boards are
impacted.
Quoted 2 lines
As the USB storage boot initialization is correctly managed by distro boot
command '
usb_boot'Quoted 2 lines
(defined in
include/config_distro_bootcmd.h, it already include 'usb start'), I think that theUSB_STORAGEtest should be removed or limited by!DISTRO_DEFAULTS.
Quoted 4 lines
[1] = "configs: stm32mp: force empty PREBOOT"
http://patchwork.ozlabs.org/project/uboot/patch/20201007081020.30635-1
-patrick.delaunay at st.com/
Quoted 6 lines
Re-re-reading everything and this is a helpful explanation. This commit is wrong as it did more than just fix
44758771ee, which put the default in the wrong place, but added new logic that shouldn't be required.Patrick, can you please send a new patch to fix this commit and in turn NOT also default usb start on
USB_STORAGE, onlyUSB_KEYBOARD? Thanks!
Done in http://patchwork.ozlabs.org/project/uboot/list/?series=207245
"Remove default value of CONFIG_PREBOOT for CONFIG_USB_STORAGE"
Patrick