]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
cmd: move CMD_DHCP6 options beneath CMD_DHCP6
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Wed, 17 Jul 2024 14:54:46 +0000 (16:54 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 19 Jul 2024 22:48:07 +0000 (16:48 -0600)
All Kconfig options that depend on CONFIG_CMD_DHCP6 should immediately
follow it.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
cmd/Kconfig

index 5d34282c19633a533027bab418bb8d1b4b8b9635..978f44eda4264096f62435f8e8ec6ee9535a4fa7 100644 (file)
@@ -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