aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJoe Hershberger2018-04-13 15:26:30 -0500
committerJoe Hershberger2018-04-13 15:47:57 -0500
commitd7a45eafda633edf14a8fe6fe430174889de0c4e (patch)
tree1bba5e8ae0695ff04d93ce0725d5dda56d19404c /net
parentb107fd5bab5d80b08f175990e902ac934719a8e2 (diff)
downloadu-boot-d7a45eafda633edf14a8fe6fe430174889de0c4e.tar.gz
u-boot-d7a45eafda633edf14a8fe6fe430174889de0c4e.tar.xz
u-boot-d7a45eafda633edf14a8fe6fe430174889de0c4e.zip
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 'net')
-rw-r--r--net/Kconfig19
-rw-r--r--net/Makefile4
2 files changed, 11 insertions, 12 deletions
diff --git a/net/Kconfig b/net/Kconfig
index 143c4416cd..d421a34d97 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -24,7 +24,7 @@ config NETCONSOLE
24 24
25config NET_TFTP_VARS 25config NET_TFTP_VARS
26 bool "Control TFTP timeout and count through environment" 26 bool "Control TFTP timeout and count through environment"
27 depends on CMD_NET 27 depends on CMD_TFTPBOOT
28 default y 28 default y
29 help 29 help
30 If set, allows controlling the TFTP timeout through the 30 If set, allows controlling the TFTP timeout through the
@@ -35,39 +35,38 @@ config NET_TFTP_VARS
35 35
36config BOOTP_BOOTPATH 36config BOOTP_BOOTPATH
37 bool "Enable BOOTP BOOTPATH" 37 bool "Enable BOOTP BOOTPATH"
38 depends on CMD_NET 38 depends on CMD_BOOTP
39 39
40config BOOTP_DNS 40config BOOTP_DNS
41 bool "Enable bootp DNS" 41 bool "Enable bootp DNS"
42 depends on CMD_NET 42 depends on CMD_BOOTP
43 43
44config BOOTP_GATEWAY 44config BOOTP_GATEWAY
45 bool "Enable BOOTP gateway" 45 bool "Enable BOOTP gateway"
46 depends on CMD_NET 46 depends on CMD_BOOTP
47 47
48config BOOTP_HOSTNAME 48config BOOTP_HOSTNAME
49 bool "Enable BOOTP hostname" 49 bool "Enable BOOTP hostname"
50 depends on CMD_NET 50 depends on CMD_BOOTP
51 51
52config BOOTP_PXE 52config BOOTP_PXE
53 bool "Enable BOOTP PXE" 53 bool "Enable BOOTP PXE"
54 depends on CMD_NET 54 depends on CMD_BOOTP
55 55
56config BOOTP_SUBNETMASK 56config BOOTP_SUBNETMASK
57 bool "Enable BOOTP subnetmask" 57 bool "Enable BOOTP subnetmask"
58 depends on CMD_NET 58 depends on CMD_BOOTP
59 depends on CMD_NET
60 59
61config BOOTP_PXE_CLIENTARCH 60config BOOTP_PXE_CLIENTARCH
62 hex 61 hex
63 depends on CMD_NET 62 depends on CMD_BOOTP
64 default 0x16 if ARM64 63 default 0x16 if ARM64
65 default 0x15 if ARM 64 default 0x15 if ARM
66 default 0 if X86 65 default 0 if X86
67 66
68config BOOTP_VCI_STRING 67config BOOTP_VCI_STRING
69 string 68 string
70 depends on CMD_NET 69 depends on CMD_BOOTP
71 default "U-Boot.armv7" if CPU_V7 || CPU_V7M 70 default "U-Boot.armv7" if CPU_V7 || CPU_V7M
72 default "U-Boot.armv8" if ARM64 71 default "U-Boot.armv8" if ARM64
73 default "U-Boot.arm" if ARM 72 default "U-Boot.arm" if ARM
diff --git a/net/Makefile b/net/Makefile
index ae54eee5af..ed102ece00 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -9,7 +9,7 @@
9 9
10obj-y += checksum.o 10obj-y += checksum.o
11obj-$(CONFIG_CMD_NET) += arp.o 11obj-$(CONFIG_CMD_NET) += arp.o
12obj-$(CONFIG_CMD_NET) += bootp.o 12obj-$(CONFIG_CMD_BOOTP) += bootp.o
13obj-$(CONFIG_CMD_CDP) += cdp.o 13obj-$(CONFIG_CMD_CDP) += cdp.o
14obj-$(CONFIG_CMD_DNS) += dns.o 14obj-$(CONFIG_CMD_DNS) += dns.o
15ifdef CONFIG_DM_ETH 15ifdef CONFIG_DM_ETH
@@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_NFS) += nfs.o
24obj-$(CONFIG_CMD_PING) += ping.o 24obj-$(CONFIG_CMD_PING) += ping.o
25obj-$(CONFIG_CMD_RARP) += rarp.o 25obj-$(CONFIG_CMD_RARP) += rarp.o
26obj-$(CONFIG_CMD_SNTP) += sntp.o 26obj-$(CONFIG_CMD_SNTP) += sntp.o
27obj-$(CONFIG_CMD_NET) += tftp.o 27obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
28 28
29# Disable this warning as it is triggered by: 29# Disable this warning as it is triggered by:
30# sprintf(buf, index ? "foo%d" : "foo", index) 30# sprintf(buf, index ? "foo%d" : "foo", index)