leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Move net command options to the cmd menu

Browse Source 
Options that controlled the tftp and bootp commands depended on their
commands, but lived in the net menu.

Move them so they are in a consistent location.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Joe Hershberger 2018-04-13 15:26:32 -05:00
parent ba6288557d
commit 92fa44d58f
2 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
cmd/Kconfig
View File

@ -1035,6 +1035,45 @@ config CMD_BOOTP
help
bootp - boot image via network using BOOTP/TFTP protocol
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
depends on CMD_BOOTP
config BOOTP_DNS
bool "Enable bootp DNS"
depends on CMD_BOOTP
config BOOTP_GATEWAY
bool "Enable BOOTP gateway"
depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Enable BOOTP hostname"
depends on CMD_BOOTP
config BOOTP_SUBNETMASK
bool "Enable BOOTP subnetmask"
depends on CMD_BOOTP
config BOOTP_PXE
bool "Enable BOOTP PXE"
depends on CMD_BOOTP
config BOOTP_PXE_CLIENTARCH
hex
depends on CMD_BOOTP
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING
string
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
default "U-Boot"
config CMD_TFTPBOOT
bool "tftpboot"
default y
@ -1053,6 +1092,17 @@ config CMD_TFTPSRV
help
Act as a TFTP server and boot the first received file
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
environment variable tftptimeout, and the TFTP maximum
timeout count through the variable tftptimeoutcountmax.
If unset, timeout and maximum are hard-defined as 1 second
and 10 timouts per TFTP transfer.
config CMD_RARP
bool "rarpboot"
help
@ -1064,12 +1114,6 @@ config CMD_DHCP
help
Boot image via network using DHCP/TFTP protocol
config CMD_PXE
bool "pxe"
select MENU
help
Boot image via network using PXE protocol
config CMD_NFS
bool "nfs"
default y
@ -1106,6 +1150,8 @@ config CMD_LINK_LOCAL
help
Acquire a network IP address using the link-local protocol
endif
config CMD_ETHSW
bool "ethsw"
help
@ -1114,7 +1160,11 @@ config CMD_ETHSW
operations such as enabling / disabling a port and
viewing/maintaining the filtering database (FDB)
endif
config CMD_PXE
bool "pxe"
select MENU
help
Boot image via network using PXE protocol
endif

50
net/Kconfig
View File

@ -22,54 +22,4 @@ config NETCONSOLE
Support the 'nc' input/output device for networked console.
See README.NetConsole for details.
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
environment variable tftptimeout, and the TFTP maximum
timeout count through the variable tftptimeoutcountmax.
If unset, timeout and maximum are hard-defined as 1 second
and 10 timouts per TFTP transfer.
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
depends on CMD_BOOTP
config BOOTP_DNS
bool "Enable bootp DNS"
depends on CMD_BOOTP
config BOOTP_GATEWAY
bool "Enable BOOTP gateway"
depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Enable BOOTP hostname"
depends on CMD_BOOTP
config BOOTP_PXE
bool "Enable BOOTP PXE"
depends on CMD_BOOTP
config BOOTP_SUBNETMASK
bool "Enable BOOTP subnetmask"
depends on CMD_BOOTP
config BOOTP_PXE_CLIENTARCH
hex
depends on CMD_BOOTP
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING
string
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
default "U-Boot"
endif # if NET