]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
cmd: remove duplicate DHCPv6 Kconfig definitions
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Sun, 8 Jun 2025 07:42:27 +0000 (09:42 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 26 Jun 2025 14:17:17 +0000 (08:17 -0600)
Remove duplicate definition of

* DHCP6_PXE_CLIENTARCH
* DHCP6_PXE_DHCP_OPTION
* DHCP6_ENTERPRISE_ID

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Fixes: da24eb553279 ("Merge patch series "BOOTP/DHCPv4 enhancements"")
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Fixes: 5eb1b7843811 ("Merge patch series "test/py: enable HTTP testing"")
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
cmd/Kconfig

index ed741d43cea37669d9b40183dc9506004776b0e8..c335eceea63528baeb7e73bccd9177a127e7dab7 100644 (file)
@@ -2004,23 +2004,6 @@ config BOOTP_RANDOM_XID
          Selecting this will allow for a random transaction ID to get
          selected for each BOOTP/DHCPv4 exchange.
 
-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_TFTPPUT
        bool "tftp put"
        depends on CMD_TFTPBOOT