diff options
| -rw-r--r-- | cmd/lwip/wget.c | 3 | ||||
| -rw-r--r-- | cmd/nvedit.c | 3 | ||||
| -rw-r--r-- | doc/board/ti/am6254atl_sk.rst | 2 | ||||
| -rw-r--r-- | doc/board/ti/am62x_sk.rst | 2 | ||||
| -rw-r--r-- | doc/develop/pytest/usage.rst | 2 | ||||
| -rw-r--r-- | doc/usage/cmd/part.rst | 2 | ||||
| -rw-r--r-- | net/lwip/tftp.c | 5 | ||||
| -rw-r--r-- | test/py/requirements.txt | 2 | ||||
| -rw-r--r-- | tools/buildman/requirements.txt | 2 |
9 files changed, 14 insertions, 9 deletions
diff --git a/cmd/lwip/wget.c b/cmd/lwip/wget.c index fc9bc11cd83..4883ad61bce 100644 --- a/cmd/lwip/wget.c +++ b/cmd/lwip/wget.c @@ -180,6 +180,8 @@ int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) ulong dst_addr; char nurl[1024]; + wget_info = &default_wget_info; + #if CONFIG_IS_ENABLED(WGET_CACERT) if (argc == 4 && !strncmp(argv[1], "cacert", strlen("cacert"))) return set_cacert(argv[2], argv[3]); @@ -214,7 +216,6 @@ int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) if (parse_legacy_arg(url, nurl, sizeof(nurl))) return CMD_RET_FAILURE; - wget_info = &default_wget_info; if (wget_do_request(dst_addr, nurl)) return CMD_RET_FAILURE; diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 11c3cea882b..636bddee1be 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -499,6 +499,9 @@ static int do_env_load(struct cmd_tbl *cmdtp, int flag, int argc, static int do_env_select(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { + if (argc < 2) + return CMD_RET_USAGE; + return env_select(argv[1]) ? 1 : 0; } #endif diff --git a/doc/board/ti/am6254atl_sk.rst b/doc/board/ti/am6254atl_sk.rst index cf58ed4c03f..7776ffb14cb 100644 --- a/doc/board/ti/am6254atl_sk.rst +++ b/doc/board/ti/am6254atl_sk.rst @@ -280,7 +280,7 @@ When using dfu-util the following commands can be used to boot to a U-Boot shell .. prompt:: bash $ dfu-util -a bootloader -D tiboot3.bin - dfu-util -R -a tispl -D tispl.bin + dfu-util -R -a tispl.bin -D tispl.bin dfu-util -R -a u-boot.img -D u-boot.img Debugging U-Boot diff --git a/doc/board/ti/am62x_sk.rst b/doc/board/ti/am62x_sk.rst index 1a0e5e07c4b..b50fff87506 100644 --- a/doc/board/ti/am62x_sk.rst +++ b/doc/board/ti/am62x_sk.rst @@ -329,7 +329,7 @@ When using dfu-util the following commands can be used to boot to a U-Boot shell .. prompt:: bash $ dfu-util -a bootloader -D tiboot3.bin - dfu-util -R -a tispl -D tispl.bin + dfu-util -R -a tispl.bin -D tispl.bin dfu-util -R -a u-boot.img -D u-boot.img .. am62x_evm_rst_include_end_dfu_boot diff --git a/doc/develop/pytest/usage.rst b/doc/develop/pytest/usage.rst index df3821da20d..924bc185b51 100644 --- a/doc/develop/pytest/usage.rst +++ b/doc/develop/pytest/usage.rst @@ -546,7 +546,7 @@ either of ``CONFIG_NET`` or ``CONFIG_NET_LWIP`` is set: .. code-block:: python - @pytest.mark.buildconfigspec('net', 'net lwip') + @pytest.mark.buildconfigspec('net', 'net_lwip') The ``notbuildconfigspec()`` annotation can be used to require a configuration option not to be set. The following annotation requires ``CONFIG_RISCV=n``: diff --git a/doc/usage/cmd/part.rst b/doc/usage/cmd/part.rst index 72f5d8b8de7..bd3df15203a 100644 --- a/doc/usage/cmd/part.rst +++ b/doc/usage/cmd/part.rst @@ -82,7 +82,7 @@ part must be specified as partition name. dev device number part - partition number + partition name varname a variable to store the current partition number value into diff --git a/net/lwip/tftp.c b/net/lwip/tftp.c index 94bacf63075..6c7ffba661e 100644 --- a/net/lwip/tftp.c +++ b/net/lwip/tftp.c @@ -279,7 +279,7 @@ int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) if (!arg) arg = net_boot_file_name; - if (arg) { + if (*arg) { /* Parse [ip:[port:]]fname */ i = 0; while ((*(words + i) = strsep(&arg, ":"))) @@ -342,6 +342,7 @@ int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) if (tftp_loop(eth_get_dev(), laddr, fname, srvip, port) < 0) ret = CMD_RET_FAILURE; out: - free(arg); + if (arg != net_boot_file_name) + free(arg); return ret; } diff --git a/test/py/requirements.txt b/test/py/requirements.txt index f9eac7901fb..e080d0f051c 100644 --- a/test/py/requirements.txt +++ b/test/py/requirements.txt @@ -1,4 +1,4 @@ -filelock==3.0.12 +filelock==3.20.1 pycryptodomex==3.21.0 pytest==8.4.2 pytest-xdist==2.5.0 diff --git a/tools/buildman/requirements.txt b/tools/buildman/requirements.txt index d48650cd1e5..d8f76e4e73d 100644 --- a/tools/buildman/requirements.txt +++ b/tools/buildman/requirements.txt @@ -1,2 +1,2 @@ -filelock==3.0.12 +filelock==3.20.1 importlib_resources==6.5.2 |