Merge branch 'main' into fix-flaky-routing-test

board/common/uboot/scripts/ixboot.sh

@@ -1,4 +1,4 @@
-echo "Press Ctrl-C NOW to enter boot menu"
+echo "Press Ctrl-C NOW to override the default boot sequence"
 if sleep "${ixbootdelay}"; then
     run ixbootorder
 
@@ -7,8 +7,12 @@ if sleep "${ixbootdelay}"; then
     reset
 fi
 
-bootmenu
 if test "${dev_mode}" != "yes"; then
+    bootmenu
     pause "Console shell access PROHIBITED. Press any key to reset..."
     reset
 fi
+
+echo
+echo 'Run "bootmenu" to interactively select a boot device'
+echo

board/common/uboot/scripts/ixprepdhcp.sh

@@ -1,12 +1,15 @@
 setenv autoload no
 
-if dhcp; then
+if test -n "${ipaddr}" -a -n "${netmask}" -a -n "${serverip}" -a -n "${bootfile}" || dhcp; then
     setenv proto tftp
     setenv dltool tftpboot
 
-    if setexpr proto sub "^(http|tftp)://.*" "\\1" "${bootfile}" && setexpr bootfile sub "^(http|tftp)://([^/]+?)/(.*)" "\2:\3"; then
+    if setexpr proto sub "^(http|tftp)://.*" "\\1" "${bootfile}"; then
 	if test "${proto}" = "http"; then
 	    setenv dltool wget
+	    setexpr bootfile sub "^http://([^/]+?)/(.*)" "\1:/\2"
+	else
+	    setexpr bootfile sub "^tftp://([^/]+?)/(.*)" "\1:\2"
 	fi
     fi