From: Heinrich Schuchardt Date: Wed, 17 Jul 2024 14:54:46 +0000 (+0200) Subject: cmd: move CMD_DHCP6 options beneath CMD_DHCP6 X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=84e000c9ab68c562575f66315d663e6cb9fddfb8;p=u-boot.git cmd: move CMD_DHCP6 options beneath CMD_DHCP6 All Kconfig options that depend on CONFIG_CMD_DHCP6 should immediately follow it. Signed-off-by: Heinrich Schuchardt Reviewed-by: Mattijs Korpershoek --- diff --git a/cmd/Kconfig b/cmd/Kconfig index 5d34282c19..978f44eda4 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1809,6 +1809,23 @@ config CMD_DHCP6 Will perform 4-message exchange with DHCPv6 server, requesting the minimum required options to TFTP boot. Complies with RFC 8415. +if CMD_DHCP6 + +config DHCP6_PXE_CLIENTARCH + hex + default 0x16 if ARM64 + default 0x15 if ARM + default 0xFF + +config DHCP6_PXE_DHCP_OPTION + bool "Request & store 'pxe_configfile' from DHCP6 server" + +config DHCP6_ENTERPRISE_ID + int "Enterprise ID to send in DHCPv6 Vendor Class Option" + default 0 + +endif + config BOOTP_MAY_FAIL bool "Allow for the BOOTP/DHCP server to not be found" depends on CMD_BOOTP @@ -1926,23 +1943,6 @@ config BOOTP_VCI_STRING default "U-Boot.arm" if ARM default "U-Boot" -if CMD_DHCP6 - -config DHCP6_PXE_CLIENTARCH - hex - default 0x16 if ARM64 - default 0x15 if ARM - default 0xFF - -config DHCP6_PXE_DHCP_OPTION - bool "Request & store 'pxe_configfile' from DHCP6 server" - -config DHCP6_ENTERPRISE_ID - int "Enterprise ID to send in DHCPv6 Vendor Class Option" - default 0 - -endif - config CMD_TFTPBOOT bool "tftpboot" default y