* [PATCH] cmd: move CMD_DHCP6 options beneath CMD_DHCP6
@ 2024-07-17 14:54 Heinrich Schuchardt
2024-07-17 16:39 ` Mattijs Korpershoek
2024-07-20 17:10 ` Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2024-07-17 14:54 UTC (permalink / raw)
To: Joe Hershberger, Ramon Fried
Cc: Tom Rini, Simon Glass, Mattijs Korpershoek, AKASHI Takahiro,
Michal Simek, Francis Laniel, Abdellatif El Khlifi, Anand Moon,
Peter Robinson, u-boot, Heinrich Schuchardt
All Kconfig options that depend on CONFIG_CMD_DHCP6 should immediately
follow it.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] cmd: move CMD_DHCP6 options beneath CMD_DHCP6
2024-07-17 14:54 [PATCH] cmd: move CMD_DHCP6 options beneath CMD_DHCP6 Heinrich Schuchardt
@ 2024-07-17 16:39 ` Mattijs Korpershoek
2024-07-20 17:10 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Mattijs Korpershoek @ 2024-07-17 16:39 UTC (permalink / raw)
To: Heinrich Schuchardt, Joe Hershberger, Ramon Fried
Cc: Tom Rini, Simon Glass, AKASHI Takahiro, Michal Simek,
Francis Laniel, Abdellatif El Khlifi, Anand Moon, Peter Robinson,
u-boot, Heinrich Schuchardt
Hi Heinrich,
Thank you for the patch.
On mer., juil. 17, 2024 at 16:54, Heinrich Schuchardt <heinrich.schuchardt@canonical.com> wrote:
> 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 | 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cmd: move CMD_DHCP6 options beneath CMD_DHCP6
2024-07-17 14:54 [PATCH] cmd: move CMD_DHCP6 options beneath CMD_DHCP6 Heinrich Schuchardt
2024-07-17 16:39 ` Mattijs Korpershoek
@ 2024-07-20 17:10 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2024-07-20 17:10 UTC (permalink / raw)
To: Joe Hershberger, Ramon Fried, Heinrich Schuchardt
Cc: Simon Glass, Mattijs Korpershoek, AKASHI Takahiro, Michal Simek,
Francis Laniel, Abdellatif El Khlifi, Anand Moon, Peter Robinson,
u-boot
On Wed, 17 Jul 2024 16:54:46 +0200, Heinrich Schuchardt wrote:
> All Kconfig options that depend on CONFIG_CMD_DHCP6 should immediately
> follow it.
>
>
Applied to u-boot/master, thanks!
--
Tom
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-20 17:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-17 14:54 [PATCH] cmd: move CMD_DHCP6 options beneath CMD_DHCP6 Heinrich Schuchardt
2024-07-17 16:39 ` Mattijs Korpershoek
2024-07-20 17:10 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.