| Message ID | 1522270276-28631-4-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: > Move DHCP to directly follow BOOTP so that Kconfig can show the > dependency as a hierarchy. > > Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> > --- I never quite understood the distinction between bootp and dhcp. I know technically bootp was an earlier version of what eventually became bootp but isn't dhcp fully backwards compatible with the bootp protocol? Code-wise it looks like bootp is dhcp without the option processing. Do we save much by keeping the separate? Regardless ... Reviewed-by: Chris Packham <judge.packham@gmail.com> > > cmd/Kconfig | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index d714f73..7ef9501 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -1024,6 +1024,12 @@ config CMD_BOOTP > help > bootp - boot image via network using BOOTP/TFTP protocol > > +config CMD_DHCP > + bool "dhcp" > + depends on CMD_BOOTP > + help > + Boot image via network using DHCP/TFTP protocol > + > config BOOTP_BOOTPATH > bool "Enable BOOTP BOOTPATH" > depends on CMD_BOOTP > @@ -1097,12 +1103,6 @@ config CMD_RARP > help > Boot image via network using RARP/TFTP protocol > > -config CMD_DHCP > - bool "dhcp" > - depends on CMD_BOOTP > - help > - Boot image via network using DHCP/TFTP protocol > - > config CMD_PXE > bool "pxe" > select MENU > -- > 1.7.11.5 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
From: Joe Hershberger <joe.hershberger@ni.com> To: u-boot@lists.denx.de Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com> Sent: Wednesday, March 28, 2018 1:53 PM Subject: [PATCH 3/9] net: Move the DHCP command below the BOOTP command Move DHCP to directly follow BOOTP so that Kconfig can show the dependency as a hierarchy. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> --- cmd/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index d714f73..7ef9501 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1024,6 +1024,12 @@ config CMD_BOOTP help bootp - boot image via network using BOOTP/TFTP protocol +config CMD_DHCP + bool "dhcp" + depends on CMD_BOOTP + help + Boot image via network using DHCP/TFTP protocol + config BOOTP_BOOTPATH bool "Enable BOOTP BOOTPATH" depends on CMD_BOOTP @@ -1097,12 +1103,6 @@ config CMD_RARP help Boot image via network using RARP/TFTP protocol -config CMD_DHCP - bool "dhcp" - depends on CMD_BOOTP - help - Boot image via network using DHCP/TFTP protocol - config CMD_PXE bool "pxe" select MENU
diff --git a/cmd/Kconfig b/cmd/Kconfig index d714f73..7ef9501 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1024,6 +1024,12 @@ config CMD_BOOTP help bootp - boot image via network using BOOTP/TFTP protocol +config CMD_DHCP + bool "dhcp" + depends on CMD_BOOTP + help + Boot image via network using DHCP/TFTP protocol + config BOOTP_BOOTPATH bool "Enable BOOTP BOOTPATH" depends on CMD_BOOTP @@ -1097,12 +1103,6 @@ config CMD_RARP help Boot image via network using RARP/TFTP protocol -config CMD_DHCP - bool "dhcp" - depends on CMD_BOOTP - help - Boot image via network using DHCP/TFTP protocol - config CMD_PXE bool "pxe" select MENU
Move DHCP to directly follow BOOTP so that Kconfig can show the dependency as a hierarchy. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> --- cmd/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)