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>
-menu "Network commands"
-
-config CMD_NET
- bool "bootp, tftpboot"
+menuconfig CMD_NET
+ bool "Network commands"
+ default y
+
+if CMD_NET
+
+config CMD_BOOTP
+ bool "bootp"
bootp - boot image via network using BOOTP/TFTP protocol
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"
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"
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
help
Act as a TFTP server and boot the first received file
config CMD_DHCP
bool "dhcp"
config CMD_DHCP
bool "dhcp"
help
Boot image via network using DHCP/TFTP protocol
config CMD_PXE
bool "pxe"
help
Boot image via network using DHCP/TFTP protocol
config CMD_PXE
bool "pxe"
select MENU
help
Boot image via network using PXE protocol
select MENU
help
Boot image via network using PXE protocol
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
return netboot_common(BOOTP, cmdtp, argc, argv);
static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
return netboot_common(BOOTP, cmdtp, argc, argv);
"boot image via network using BOOTP/TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
"boot image via network using BOOTP/TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#ifdef CONFIG_CMD_TFTPBOOT
int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int ret;
int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int ret;
"boot image via network using TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
"boot image via network using TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
#ifdef CONFIG_CMD_TFTPPUT
static int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#ifdef CONFIG_CMD_TFTPPUT
static int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
config NET_TFTP_VARS
bool "Control TFTP timeout and count through environment"
config NET_TFTP_VARS
bool "Control TFTP timeout and count through environment"
+ depends on CMD_TFTPBOOT
default y
help
If set, allows controlling the TFTP timeout through the
default y
help
If set, allows controlling the TFTP timeout through the
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
config BOOTP_DNS
bool "Enable bootp DNS"
config BOOTP_DNS
bool "Enable bootp DNS"
config BOOTP_GATEWAY
bool "Enable BOOTP gateway"
config BOOTP_GATEWAY
bool "Enable BOOTP gateway"
config BOOTP_HOSTNAME
bool "Enable BOOTP hostname"
config BOOTP_HOSTNAME
bool "Enable BOOTP hostname"
config BOOTP_PXE
bool "Enable BOOTP PXE"
config BOOTP_PXE
bool "Enable BOOTP PXE"
config BOOTP_SUBNETMASK
bool "Enable BOOTP subnetmask"
config BOOTP_SUBNETMASK
bool "Enable BOOTP subnetmask"
- depends on CMD_NET
- depends on CMD_NET
config BOOTP_PXE_CLIENTARCH
hex
config BOOTP_PXE_CLIENTARCH
hex
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING
string
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING
string
default "U-Boot.armv7" if CPU_V7 || CPU_V7M
default "U-Boot.armv8" if ARM64
default "U-Boot.arm" if ARM
default "U-Boot.armv7" if CPU_V7 || CPU_V7M
default "U-Boot.armv8" if ARM64
default "U-Boot.arm" if ARM
obj-y += checksum.o
obj-$(CONFIG_CMD_NET) += arp.o
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
obj-$(CONFIG_CMD_CDP) += cdp.o
obj-$(CONFIG_CMD_DNS) += dns.o
ifdef CONFIG_DM_ETH
obj-$(CONFIG_CMD_PING) += ping.o
obj-$(CONFIG_CMD_RARP) += rarp.o
obj-$(CONFIG_CMD_SNTP) += sntp.o
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)
# Disable this warning as it is triggered by:
# sprintf(buf, index ? "foo%d" : "foo", index)