diff options
author | Joe Hershberger | 2018-04-13 15:26:30 -0500 |
---|---|---|
committer | Joe Hershberger | 2018-04-13 15:47:57 -0500 |
commit | d7a45eafda633edf14a8fe6fe430174889de0c4e (patch) | |
tree | 1bba5e8ae0695ff04d93ce0725d5dda56d19404c /net | |
parent | b107fd5bab5d80b08f175990e902ac934719a8e2 (diff) | |
download | u-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/Kconfig | 19 | ||||
-rw-r--r-- | net/Makefile | 4 |
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 | ||
25 | config NET_TFTP_VARS | 25 | config 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 | ||
36 | config BOOTP_BOOTPATH | 36 | config BOOTP_BOOTPATH |
37 | bool "Enable BOOTP BOOTPATH" | 37 | bool "Enable BOOTP BOOTPATH" |
38 | depends on CMD_NET | 38 | depends on CMD_BOOTP |
39 | 39 | ||
40 | config BOOTP_DNS | 40 | config BOOTP_DNS |
41 | bool "Enable bootp DNS" | 41 | bool "Enable bootp DNS" |
42 | depends on CMD_NET | 42 | depends on CMD_BOOTP |
43 | 43 | ||
44 | config BOOTP_GATEWAY | 44 | config BOOTP_GATEWAY |
45 | bool "Enable BOOTP gateway" | 45 | bool "Enable BOOTP gateway" |
46 | depends on CMD_NET | 46 | depends on CMD_BOOTP |
47 | 47 | ||
48 | config BOOTP_HOSTNAME | 48 | config BOOTP_HOSTNAME |
49 | bool "Enable BOOTP hostname" | 49 | bool "Enable BOOTP hostname" |
50 | depends on CMD_NET | 50 | depends on CMD_BOOTP |
51 | 51 | ||
52 | config BOOTP_PXE | 52 | config BOOTP_PXE |
53 | bool "Enable BOOTP PXE" | 53 | bool "Enable BOOTP PXE" |
54 | depends on CMD_NET | 54 | depends on CMD_BOOTP |
55 | 55 | ||
56 | config BOOTP_SUBNETMASK | 56 | config 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 | ||
61 | config BOOTP_PXE_CLIENTARCH | 60 | config 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 | ||
68 | config BOOTP_VCI_STRING | 67 | config 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 | ||
10 | obj-y += checksum.o | 10 | obj-y += checksum.o |
11 | obj-$(CONFIG_CMD_NET) += arp.o | 11 | obj-$(CONFIG_CMD_NET) += arp.o |
12 | obj-$(CONFIG_CMD_NET) += bootp.o | 12 | obj-$(CONFIG_CMD_BOOTP) += bootp.o |
13 | obj-$(CONFIG_CMD_CDP) += cdp.o | 13 | obj-$(CONFIG_CMD_CDP) += cdp.o |
14 | obj-$(CONFIG_CMD_DNS) += dns.o | 14 | obj-$(CONFIG_CMD_DNS) += dns.o |
15 | ifdef CONFIG_DM_ETH | 15 | ifdef CONFIG_DM_ETH |
@@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_NFS) += nfs.o | |||
24 | obj-$(CONFIG_CMD_PING) += ping.o | 24 | obj-$(CONFIG_CMD_PING) += ping.o |
25 | obj-$(CONFIG_CMD_RARP) += rarp.o | 25 | obj-$(CONFIG_CMD_RARP) += rarp.o |
26 | obj-$(CONFIG_CMD_SNTP) += sntp.o | 26 | obj-$(CONFIG_CMD_SNTP) += sntp.o |
27 | obj-$(CONFIG_CMD_NET) += tftp.o | 27 | obj-$(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) |