distro_boot: Fix block device after DHCP boot sequence
PATCH 1/1 distro_boot: Fix block device after DHCP boot sequence
The generic distro boot sequence iterates over several types of devices, trying one after another. In doing do, it starts with setting the "devtype" variable, then uses this later in more generic commands.
Now most (block) device types use a local variable for that, but DHCP puts the type into the environment, where it shadows any local variables. As a consequence any boot attempt after bootcmd_dhcp has been run fails:
===========================
VExpress64# run bootcmd_dhcp
...
VExpress64# run bootcmd_sata0
SATA#0:
(3.0 Gbps)
SATA#1:
(No RDY)
Device 0: Model: 16GB SATA Flash Drive ....
... is now current device
Couldn't find partition dhcp 0:1
===========================
This problem typically doesn't show, because DHCP is mostly the last command to try, but is a problem when this order is different, or when distro_bootcmd or bootcmd_xxx are run separately or multiple times.
Let bootcmd_dhcp use a local variable, as the other kids do, to make the order of boot commands irrelevant, and allow repeated calls.
--- include/config_distro_bootcmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/config_distro_bootcmd.h +1 -1
@@ -375,7 +375,7 @@#endif #define BOOTENV_DEV_DHCP (devtypeu, devtypel, instance) \ "bootcmd_dhcp=" \ - "setenv devtype " #devtypel "; " \ + "devtype=" #devtypel "; " \ BOOTENV_RUN_NET_USB_START \ BOOTENV_RUN_PCI_ENUM \ "if dhcp ${scriptaddr} ${boot_script_dhcp}; then " \
Signature · 1 line
2.17.5
Quoted 24 lines · Andre Przywara
The generic distro boot sequence iterates over several types of devices, trying one after another. In doing do, it starts with setting the "devtype" variable, then uses this later in more generic commands.
Now most (block) device types use a local variable for that, but DHCP puts the type into the environment, where it shadows any local variables. As a consequence any boot attempt after
bootcmd_dhcphas been run fails:
===========================
VExpress64# runbootcmd_dhcp
...
VExpress64# runbootcmd_sata0
SATA#0:(3.0 Gbps)SATA#1:
(No RDY)
Device 0: Model: 16GB SATA Flash Drive ....
... is now current device
Couldn't find partition dhcp 0:1
===========================
This problem typically doesn't show, because DHCP is mostly the last command to try, but is a problem when this order is different, or whendistro_bootcmdorbootcmd_xxxare run separately or multiple times.
Quoted 7 lines
Let
bootcmd_dhcpuse a local variable, as the other kids do, to make the order of boot commands irrelevant, and allow repeated calls.Signed-off-by Andre Przywara <[email protected]>--- include/config_distro_bootcmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 23 lines · Andre Przywara
The generic distro boot sequence iterates over several types of devices, trying one after another. In doing do, it starts with setting the "devtype" variable, then uses this later in more generic commands.
Now most (block) device types use a local variable for that, but DHCP puts the type into the environment, where it shadows any local variables. As a consequence any boot attempt after
bootcmd_dhcphas been run fails:
===========================
VExpress64# runbootcmd_dhcp
...
VExpress64# runbootcmd_sata0
SATA#0:(3.0 Gbps)SATA#1:
(No RDY)
Device 0: Model: 16GB SATA Flash Drive ....
... is now current device
Couldn't find partition dhcp 0:1
===========================
This problem typically doesn't show, because DHCP is mostly the last command to try, but is a problem when this order is different, or whendistro_bootcmdorbootcmd_xxxare run separately or multiple times.
Quoted 5 lines
Let
bootcmd_dhcpuse a local variable, as the other kids do, to make the order of boot commands irrelevant, and allow repeated calls.Signed-off-by Andre Przywara <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom