| Message ID | 1522270276-28631-3-git-send-email-joe.hershberger@ni.com |
|---|---|
| State | Superseded |
| Delegated to: | Joe Hershberger |
| Headers | show |
| Series | net: Clean up the menus and dependencies among commands and options | expand |
On Thu, Mar 29, 2018 at 9:51 AM, Joe Hershberger <joe.hershberger@ni.com> wrote: > 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> > cmd/Kconfig | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ > net/Kconfig | 50 -------------------------------------------------- > 2 files changed, 50 insertions(+), 50 deletions(-) > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index f2a12ce..d714f73 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -1024,6 +1024,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 > @@ -1042,6 +1081,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 > diff --git a/net/Kconfig b/net/Kconfig > index d421a34..f2363e5 100644 > --- a/net/Kconfig > +++ b/net/Kconfig > @@ -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 > -- > 1.7.11.5 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/cmd/Kconfig b/cmd/Kconfig index f2a12ce..d714f73 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1024,6 +1024,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 @@ -1042,6 +1081,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 diff --git a/net/Kconfig b/net/Kconfig index d421a34..f2363e5 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -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
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> --- cmd/Kconfig | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ net/Kconfig | 50 -------------------------------------------------- 2 files changed, 50 insertions(+), 50 deletions(-)