On 11/6/24 14:02, Adriano Cordova wrote:

Let net/wget.c and net/lwip/wget.c depend on CONFIG_WGET, and cmd/wget.c depend on CONFIG_CMD_WGET. This way, the wget code can be used regardless of whether the wget command is available.

Signed-off-by: Adriano Cordova adrianox@gmail.com

Reviewed-by: Heinrich Schuchardt xypron.glpk@gmx.de

---

cmd/Kconfig | 5 +---- net/Kconfig | 9 +++++++++ net/Makefile | 2 +- net/lwip/Makefile | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 636833646f..8f3ad94089 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2115,11 +2115,8 @@ config CMD_TFTPBOOT

config CMD_WGET bool "wget"

• depends on CMD_NET default y if SANDBOX
• select PROT_TCP if NET
• select PROT_TCP_LWIP if NET_LWIP
• select PROT_DNS_LWIP if NET_LWIP

• select WGET help wget is a simple command to download kernel, or other files, from a http server over TCP.

diff --git a/net/Kconfig b/net/Kconfig index 76ab7d91ee..b4bb68dd61 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -244,6 +244,15 @@ config NET_RANDOM_ETHADDR generated. It will be saved to the appropriate environment variable, too.

+config WGET

• bool "Enable wget"
• select PROT_TCP if NET
• select PROT_TCP_LWIP if NET_LWIP
• select PROT_DNS_LWIP if NET_LWIP
• help

•  Selecting this will enable wget, an interface to send HTTP requests
  

•  via the network stack.
  

• config TFTP_BLOCKSIZE int "TFTP block size" default 1468

diff --git a/net/Makefile b/net/Makefile index 209377aeb2..7c917b318c 100644 --- a/net/Makefile +++ b/net/Makefile @@ -29,7 +29,7 @@ obj-$(CONFIG_$(PHASE_)TCP_FUNCTION_FASTBOOT) += fastboot_tcp.o obj-$(CONFIG_CMD_WOL) += wol.o obj-$(CONFIG_PROT_UDP) += udp.o obj-$(CONFIG_PROT_TCP) += tcp.o -obj-$(CONFIG_CMD_WGET) += wget.o +obj-$(CONFIG_WGET) += wget.o

# Disable this warning as it is triggered by: # sprintf(buf, index ? "foo%d" : "foo", index) diff --git a/net/lwip/Makefile b/net/lwip/Makefile index f2558f8763..79dd6b3fb5 100644 --- a/net/lwip/Makefile +++ b/net/lwip/Makefile @@ -5,4 +5,4 @@ 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 +obj-$(CONFIG_WGET) += wget.o