summaryrefslogtreecommitdiff
path: root/cmd/Kconfig
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2018-04-13 15:26:30 -0500
committerJoe Hershberger <joe.hershberger@ni.com>2018-04-13 15:47:57 -0500
commitd7a45eafda633edf14a8fe6fe430174889de0c4e (patch)
tree1bba5e8ae0695ff04d93ce0725d5dda56d19404c /cmd/Kconfig
parentb107fd5bab5d80b08f175990e902ac934719a8e2 (diff)
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>
Diffstat (limited to 'cmd/Kconfig')
-rw-r--r--cmd/Kconfig25
1 files changed, 17 insertions, 8 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig
index d440675b6e3..fb742272d83 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1021,25 +1021,35 @@ config CMD_SETEXPR
endmenu
-menu "Network commands"
-
if NET
-config CMD_NET
- bool "bootp, tftpboot"
+menuconfig CMD_NET
+ bool "Network commands"
+ default y
+
+if CMD_NET
+
+config CMD_BOOTP
+ bool "bootp"
default y
help
- Network commands.
bootp - boot image via network using BOOTP/TFTP protocol
+
+config CMD_TFTPBOOT
+ bool "tftpboot"
+ default y
+ help
tftpboot - boot image via network using TFTP protocol
config CMD_TFTPPUT
bool "tftp put"
+ depends on CMD_TFTPBOOT
help
TFTP put command, for uploading files to a server
config CMD_TFTPSRV
bool "tftpsrv"
+ depends on CMD_TFTPBOOT
help
Act as a TFTP server and boot the first received file
@@ -1050,13 +1060,12 @@ config CMD_RARP
config CMD_DHCP
bool "dhcp"
- depends on CMD_NET
+ depends on CMD_BOOTP
help
Boot image via network using DHCP/TFTP protocol
config CMD_PXE
bool "pxe"
- depends on CMD_NET
select MENU
help
Boot image via network using PXE protocol
@@ -1107,7 +1116,7 @@ config CMD_ETHSW
endif
-endmenu
+endif
menu "Misc commands"