[PATCH] cmd: move CMD_DHCP6 options beneath CMD_DHCP6

[Mattijs Korpershoek]

Hi Heinrich,

Thank you for the patch.

On mer., juil. 17, 2024 at 16:54, Heinrich Schuchardt <heinrich.schuchardt at canonical.com> wrote:

> All Kconfig options that depend on CONFIG_CMD_DHCP6 should immediately
> follow it.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>

Reviewed-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>

> ---
>  cmd/Kconfig | 34 +++++++++++++++++-----------------
>  1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 0cf0d8ad8ab..323e473cd64 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1810,6 +1810,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
> @@ -1927,23 +1944,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
> -- 
> 2.45.2