Merge tag 'v2026.01-rc5' into next

Prepare v2026.01-rc5
This commit is contained in:
Tom Rini
2025-12-22 16:31:21 -06:00
12 changed files with 16 additions and 12 deletions

View File

@@ -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.

View File

@@ -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;

View File

@@ -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