Merge tag 'v2025.01-rc5' into next

Prepare v2025.01-rc5
This commit is contained in:
Tom Rini
2024-12-25 22:31:04 -06:00
108 changed files with 383 additions and 724 deletions

View File

@@ -90,7 +90,7 @@ config TFTP_WINDOWSIZE
config TFTP_TSIZE
bool "Track TFTP transfers based on file size option"
depends on CMD_TFTPBOOT
default y if (ARCH_OMAP2PLUS || ARCH_K3)
default y if (ARCH_OMAP2PLUS || ARCH_K3 || ARCH_RENESAS)
help
By default, TFTP progress bar is increased for each received UDP
frame, which can lead into long time being spent for sending

View File

@@ -3,6 +3,7 @@
#include <command.h>
#include <console.h>
#include <log.h>
#include <dm/device.h>
#include <linux/delay.h>
#include <linux/errno.h>
@@ -112,10 +113,17 @@ static int dhcp_loop(struct udevice *udev)
int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
int ret;
struct udevice *dev;
eth_set_current();
ret = dhcp_loop(eth_get_dev());
dev = eth_get_dev();
if (!dev) {
log_err("No network device\n");
return CMD_RET_FAILURE;
}
ret = dhcp_loop(dev);
if (ret)
return ret;

View File

@@ -56,7 +56,7 @@ static int dns_loop(struct udevice *udev, const char *name, const char *var)
netif = net_lwip_new_netif(udev);
if (!netif)
return -1;
return CMD_RET_FAILURE;
dns_init();