Merge tag 'net-20250314' of https://source.denx.de/u-boot/custodians/u-boot-net
Pull request net-20250314.
kconfig:
* Fix submenu for network commands
net:
* Remove a useless (commented out) line in net-common.h
net-lwip:
* Remove error print on failed tx
* Fix return code of ping_loop() when no ethernet device is found
* Remove superfluous newline in help text for tftp
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 642cc11..ce8393c 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1833,12 +1833,10 @@
bool "Network commands"
default y
-endif
+if CMD_NET
if NET
-if CMD_NET
-
config CMD_BOOTP
bool "bootp"
default y
@@ -2079,7 +2077,6 @@
help
Will automatically perform router solicitation on first IPv6
network operation
-endif # if CMD_NET
config CMD_ETHSW
bool "ethsw"
@@ -2096,10 +2093,6 @@
endif # if NET
-if NET || NET_LWIP
-
-if CMD_NET
-
config CMD_DHCP
bool "dhcp"
select PROT_DHCP_LWIP if NET_LWIP
@@ -2175,8 +2168,6 @@
help
Enable TLS over http for wget.
-endif # if CMD_NET
-
config CMD_PXE
bool "pxe"
select PXE_UTILS
@@ -2184,7 +2175,9 @@
help
Boot image via network using PXE protocol
+endif # if CMD_NET
+
-endif # if NET || NET_LWIP
+endif # NET || NET_LWIP
menu "Misc commands"
diff --git a/cmd/net-lwip.c b/cmd/net-lwip.c
index 0fd446e..2495562 100644
--- a/cmd/net-lwip.c
+++ b/cmd/net-lwip.c
@@ -17,7 +17,7 @@
#if defined(CONFIG_CMD_TFTPBOOT)
U_BOOT_CMD(tftpboot, 3, 0, do_tftpb,
- "boot image via network using TFTP protocol\n",
+ "boot image via network using TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]");
#endif
diff --git a/include/net-common.h b/include/net-common.h
index 29d31f3..89679e2 100644
--- a/include/net-common.h
+++ b/include/net-common.h
@@ -518,7 +518,6 @@
* Return: true if uri is valid, false if uri is invalid
*/
bool wget_validate_uri(char *uri);
-//int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
/**
* enum wget_http_method - http method
diff --git a/net/lwip/net-lwip.c b/net/lwip/net-lwip.c
index cab1dd7..4d2aa60 100644
--- a/net/lwip/net-lwip.c
+++ b/net/lwip/net-lwip.c
@@ -50,7 +50,7 @@
err = eth_get_ops(udev)->send(udev, pp ? pp : p->payload, p->len);
free(pp);
if (err) {
- log_err("send error %d\n", err);
+ debug("send error %d\n", err);
return ERR_ABRT;
}
diff --git a/net/lwip/ping.c b/net/lwip/ping.c
index 200a702..c586a96 100644
--- a/net/lwip/ping.c
+++ b/net/lwip/ping.c
@@ -121,7 +121,7 @@
netif = net_lwip_new_netif(udev);
if (!netif)
- return CMD_RET_FAILURE;
+ return -ENODEV;
printf("Using %s device\n", udev->name);