net: Make CMD_NET a menuconfig
Previously, CMD_NET was an alias for 2 commands (bootp and tftpboot) and
they we not able to be disabled. Separate out those 2 commands and move
CMD_NET up to the menu level, which more accurately represents the code.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Duncan Hare <dh@synoia.com>
diff --git a/net/Kconfig b/net/Kconfig
index 143c441..d421a34 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -24,7 +24,7 @@
config NET_TFTP_VARS
bool "Control TFTP timeout and count through environment"
- depends on CMD_NET
+ depends on CMD_TFTPBOOT
default y
help
If set, allows controlling the TFTP timeout through the
@@ -35,39 +35,38 @@
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_DNS
bool "Enable bootp DNS"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_GATEWAY
bool "Enable BOOTP gateway"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Enable BOOTP hostname"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_PXE
bool "Enable BOOTP PXE"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_SUBNETMASK
bool "Enable BOOTP subnetmask"
- depends on CMD_NET
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_PXE_CLIENTARCH
hex
- depends on CMD_NET
+ depends on CMD_BOOTP
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING
string
- depends on CMD_NET
+ depends on CMD_BOOTP
default "U-Boot.armv7" if CPU_V7 || CPU_V7M
default "U-Boot.armv8" if ARM64
default "U-Boot.arm" if ARM
diff --git a/net/Makefile b/net/Makefile
index ae54eee..ed102ec 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -9,7 +9,7 @@
obj-y += checksum.o
obj-$(CONFIG_CMD_NET) += arp.o
-obj-$(CONFIG_CMD_NET) += bootp.o
+obj-$(CONFIG_CMD_BOOTP) += bootp.o
obj-$(CONFIG_CMD_CDP) += cdp.o
obj-$(CONFIG_CMD_DNS) += dns.o
ifdef CONFIG_DM_ETH
@@ -24,7 +24,7 @@
obj-$(CONFIG_CMD_PING) += ping.o
obj-$(CONFIG_CMD_RARP) += rarp.o
obj-$(CONFIG_CMD_SNTP) += sntp.o
-obj-$(CONFIG_CMD_NET) += tftp.o
+obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
# Disable this warning as it is triggered by:
# sprintf(buf, index ? "foo%d" : "foo", index)