diff options
| author | Tom Rini <[email protected]> | 2025-04-23 08:53:23 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-04-23 08:53:23 -0600 |
| commit | 5d4a6995bb4311203a024200a402508fdf5d7dfb (patch) | |
| tree | 6410ca5d2528856f84e425630d9109ea2961070b /cmd | |
| parent | 4446bc331c65d3efb8a9321d6368c61edb56479b (diff) | |
| parent | 49ae68536f234c423c78e89913c64ae9b87ed0e8 (diff) | |
Merge tag 'net-20250423' of https://source.denx.de/u-boot/custodians/u-boot-net
Pull request net-20250423
net:
- Make initr_net() invocation command line agnostic
net-legacy:
- net: dhcpv6: remove excluded middle expression
- net: dhcp6: Send DHCPv6 using multicast MAC
net-lwip:
- lwIP sandbox tests
misc:
- cmd: Remove CMD_NET protection
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/net.c | 3 | ||||
| -rw-r--r-- | cmd/pxe.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/cmd/net.c b/cmd/net.c index 79525f73a51..eaa1de5295f 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -456,8 +456,7 @@ static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc, } #if defined(CONFIG_CMD_PING) -static int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]) +int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { if (argc < 2) return CMD_RET_USAGE; diff --git a/cmd/pxe.c b/cmd/pxe.c index 37b8dea6ad6..0f26b3b4219 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -13,7 +13,6 @@ #include "pxe_utils.h" -#ifdef CONFIG_CMD_NET const char *pxe_default_paths[] = { #ifdef CONFIG_SYS_SOC #ifdef CONFIG_SYS_BOARD @@ -331,5 +330,3 @@ U_BOOT_CMD(pxe, 4, 1, do_pxe, "get [" USE_IP6_CMD_PARAM "] - try to retrieve a pxe file using tftp\n" "pxe boot [pxefile_addr_r] [-ipv6] - boot from the pxe file at pxefile_addr_r\n" ); - -#endif /* CONFIG_CMD_NET */ |