diff options
| -rw-r--r-- | cmd/Makefile | 2 | ||||
| -rw-r--r-- | cmd/lwip/Makefile | 3 | ||||
| -rw-r--r-- | cmd/lwip/dhcp.c | 9 | ||||
| -rw-r--r-- | cmd/lwip/dns.c | 3 | ||||
| -rw-r--r-- | cmd/lwip/ping.c | 3 | ||||
| -rw-r--r-- | cmd/lwip/tftp.c | 9 | ||||
| -rw-r--r-- | cmd/lwip/wget.c (renamed from cmd/net-lwip.c) | 26 |
7 files changed, 29 insertions, 26 deletions
diff --git a/cmd/Makefile b/cmd/Makefile index 9c5bfc91659..34fa73d64fc 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -133,7 +133,7 @@ obj-$(CONFIG_CMD_NAND) += nand.o ifdef CONFIG_NET obj-$(CONFIG_CMD_NET) += net.o net-common.o else ifdef CONFIG_NET_LWIP -obj-$(CONFIG_CMD_NET) += net-lwip.o net-common.o +obj-$(CONFIG_CMD_NET) += net-common.o obj-y += lwip/ endif obj-$(CONFIG_ENV_SUPPORT) += nvedit.o diff --git a/cmd/lwip/Makefile b/cmd/lwip/Makefile index da79b64b5c2..4c28d2b28e5 100644 --- a/cmd/lwip/Makefile +++ b/cmd/lwip/Makefile @@ -1,2 +1,5 @@ +obj-$(CONFIG_CMD_DHCP) += dhcp.o obj-$(CONFIG_CMD_DNS) += dns.o obj-$(CONFIG_CMD_PING) += ping.o +obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o +obj-$(CONFIG_CMD_WGET) += wget.o diff --git a/cmd/lwip/dhcp.c b/cmd/lwip/dhcp.c new file mode 100644 index 00000000000..3894d71f654 --- /dev/null +++ b/cmd/lwip/dhcp.c @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (C) 2024-2025 Linaro Ltd. */ + +#include <command.h> +#include <net.h> + +U_BOOT_CMD(dhcp, 3, 1, do_dhcp, + "boot image via network using DHCP/TFTP protocol", + "[loadAddress] [[hostIPaddr:]bootfilename]"); diff --git a/cmd/lwip/dns.c b/cmd/lwip/dns.c index fe70bdb4828..0af538e18f5 100644 --- a/cmd/lwip/dns.c +++ b/cmd/lwip/dns.c @@ -9,6 +9,9 @@ #include <net.h> #include <time.h> +U_BOOT_CMD(dns, 3, 1, do_dns, "lookup the IP of a hostname", + "hostname [envvar]"); + #define DNS_RESEND_MS 1000 #define DNS_TIMEOUT_MS 10000 diff --git a/cmd/lwip/ping.c b/cmd/lwip/ping.c index 1390b914f7d..6996931fa40 100644 --- a/cmd/lwip/ping.c +++ b/cmd/lwip/ping.c @@ -13,6 +13,9 @@ #include <net.h> #include <time.h> +U_BOOT_CMD(ping, 2, 1, do_ping, "send ICMP ECHO_REQUEST to network host", + "pingAddress"); + #define PING_DELAY_MS 1000 #define PING_COUNT 5 /* Ping identifier - must fit on a u16_t */ diff --git a/cmd/lwip/tftp.c b/cmd/lwip/tftp.c new file mode 100644 index 00000000000..6bb7a3733a2 --- /dev/null +++ b/cmd/lwip/tftp.c @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (C) 2024-2025 Linaro Ltd. */ + +#include <command.h> +#include <net.h> + +U_BOOT_CMD(tftpboot, 3, 0, do_tftpb, + "boot image via network using TFTP protocol", + "[loadAddress] [[hostIPaddr:]bootfilename]"); diff --git a/cmd/net-lwip.c b/cmd/lwip/wget.c index cecf8d02555..3f5b9952c93 100644 --- a/cmd/net-lwip.c +++ b/cmd/lwip/wget.c @@ -1,32 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ -/* Copyright (C) 2024 Linaro Ltd. */ +/* Copyright (C) 2024-2025 Linaro Ltd. */ #include <command.h> #include <net.h> -#if defined(CONFIG_CMD_DHCP) -U_BOOT_CMD(dhcp, 3, 1, do_dhcp, - "boot image via network using DHCP/TFTP protocol", - "[loadAddress] [[hostIPaddr:]bootfilename]"); -#endif - -#if defined(CONFIG_CMD_PING) -U_BOOT_CMD(ping, 2, 1, do_ping, "send ICMP ECHO_REQUEST to network host", - "pingAddress"); -#endif - -#if defined(CONFIG_CMD_TFTPBOOT) -U_BOOT_CMD(tftpboot, 3, 0, do_tftpb, - "boot image via network using TFTP protocol", - "[loadAddress] [[hostIPaddr:]bootfilename]"); -#endif - -#if defined(CONFIG_CMD_DNS) -U_BOOT_CMD(dns, 3, 1, do_dns, "lookup the IP of a hostname", - "hostname [envvar]"); -#endif - -#if defined(CONFIG_CMD_WGET) U_BOOT_CMD(wget, 4, 1, do_wget, "boot image via network using HTTP/HTTPS protocol" #if defined(CONFIG_WGET_CACERT) @@ -47,4 +24,3 @@ U_BOOT_CMD(wget, 4, 1, do_wget, #endif #endif ); -#endif |