colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'net-20250314' of https://source.denx.de/u-boot/custodians/u-boot-net

Browse Source 
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
This commit is contained in:
Tom Rini
2025-03-31 07:39:36 -06:00
parent 5e74863ad6 64b973fc78
commit c17f03a7e9
5 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/Kconfig
View File

@@ -1833,12 +1833,10 @@ menuconfig CMD_NET
bool "Network commands" bool "Network commands"
default y default y
endif if CMD_NET
if NET if NET
if CMD_NET
config CMD_BOOTP config CMD_BOOTP
bool "bootp" bool "bootp"
default y default y
@@ -2079,7 +2077,6 @@ config IPV6_ROUTER_DISCOVERY
help help
Will automatically perform router solicitation on first IPv6 Will automatically perform router solicitation on first IPv6
network operation network operation
endif # if CMD_NET
config CMD_ETHSW config CMD_ETHSW
bool "ethsw" bool "ethsw"
@@ -2096,10 +2093,6 @@ config CMD_WOL
endif # if NET endif # if NET
if NET || NET_LWIP
if CMD_NET
config CMD_DHCP config CMD_DHCP
bool "dhcp" bool "dhcp"
select PROT_DHCP_LWIP if NET_LWIP select PROT_DHCP_LWIP if NET_LWIP
@@ -2175,8 +2168,6 @@ config WGET_HTTPS
help help
Enable TLS over http for wget. Enable TLS over http for wget.
endif # if CMD_NET
config CMD_PXE config CMD_PXE
bool "pxe" bool "pxe"
select PXE_UTILS select PXE_UTILS
@@ -2184,7 +2175,9 @@ config CMD_PXE
help help
Boot image via network using PXE protocol Boot image via network using PXE protocol
endif # if NET || NET_LWIP endif # if CMD_NET
endif # NET || NET_LWIP
menu "Misc commands" menu "Misc commands"

2
cmd/net-lwip.c
View File

@@ -17,7 +17,7 @@ U_BOOT_CMD(ping, 2, 1, do_ping, "send ICMP ECHO_REQUEST to network host",
#if defined(CONFIG_CMD_TFTPBOOT) #if defined(CONFIG_CMD_TFTPBOOT)
U_BOOT_CMD(tftpboot, 3, 0, do_tftpb, 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]"); "[loadAddress] [[hostIPaddr:]bootfilename]");
#endif #endif

1
include/net-common.h
View File

@@ -518,7 +518,6 @@ int wget_do_request(ulong dst_addr, char *uri);
* Return: true if uri is valid, false if uri is invalid * Return: true if uri is valid, false if uri is invalid
*/ */
bool wget_validate_uri(char *uri); 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 * enum wget_http_method - http method

2
net/lwip/net-lwip.c
View File

@@ -50,7 +50,7 @@ static err_t linkoutput(struct netif *netif, struct pbuf *p)
err = eth_get_ops(udev)->send(udev, pp ? pp : p->payload, p->len); err = eth_get_ops(udev)->send(udev, pp ? pp : p->payload, p->len);
free(pp); free(pp);
if (err) { if (err) {
log_err("send error %d\n", err); debug("send error %d\n", err);
return ERR_ABRT; return ERR_ABRT;
} }

2
net/lwip/ping.c
View File

@@ -121,7 +121,7 @@ static int ping_loop(struct udevice *udev, const ip_addr_t *addr)
netif = net_lwip_new_netif(udev); netif = net_lwip_new_netif(udev);
if (!netif) if (!netif)
return CMD_RET_FAILURE; return -ENODEV;
printf("Using %s device\n", udev->name); printf("Using %s device\n", udev->name);