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>
This commit is contained in:
Joe Hershberger
2018-04-13 15:26:30 -05:00
parent b107fd5bab
commit d7a45eafda
4 changed files with 32 additions and 20 deletions

View File

@@ -24,7 +24,7 @@ config NETCONSOLE
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 NET_TFTP_VARS
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