diff options
| author | Tom Rini <[email protected]> | 2025-12-22 16:31:21 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-12-22 16:31:21 -0600 |
| commit | dac8d9c3cc115cc8549b9d012b0f71222a0ebf02 (patch) | |
| tree | 87d0bc2239a0ab7a9867a593d9abc0de5c895ce6 /cmd | |
| parent | 29ab19c2beade4cc959e14460975ddf7b6886cec (diff) | |
| parent | 0f6ff53d55ba254de8a995c2a2f5a313acd40ac7 (diff) | |
Merge tag 'v2026.01-rc5' into next
Prepare v2026.01-rc5
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/lwip/wget.c | 3 | ||||
| -rw-r--r-- | cmd/nvedit.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 9aecfe504bb..f1e84ff02c3 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1864,7 +1864,7 @@ menu "Shell scripting commands" config CMD_C5_PL330_DMA bool "Release Reset DMA Channels for PL330 Handshake" - depends on TARGET_SOCFPGA_CYCLONE5_SOCDK + depends on TARGET_SOCFPGA_CYCLONE5 help Provides access to Reset Manager Per2ModRst. Enables DMA channels for ARM PrimeCell PL330 via reset release. 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 |