diff options
| author | Tom Rini <[email protected]> | 2023-11-06 09:45:33 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-11-06 09:45:33 -0500 |
| commit | fd0d7d7efecd22d5a9cc77cb7589c4f144a1c506 (patch) | |
| tree | 931e72fdf65dbfde58b84ee4de4d7cb1f360dbcf /cmd | |
| parent | a4c83bda17196bf5d1ce640844595aaeced6465e (diff) | |
| parent | d44f3d21fe4420709b5a09379b809a3b92b7fa07 (diff) | |
Merge branch '2023-11-06-networking-updates'
- A few dhcp related improvements, be clearer to the user when we don't
have a MAC address, assorted driver/phy improvements and new drivers.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 4 | ||||
| -rw-r--r-- | cmd/pxe.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index fd16c3a48e5..df6d71c103f 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1840,6 +1840,10 @@ config BOOTP_PXE_CLIENTARCH default 0x15 if ARM default 0x0 if X86 +config BOOTP_PXE_DHCP_OPTION + bool "Request & store 'pxe_configfile' from BOOTP/DHCP server" + depends on BOOTP_PXE + config BOOTP_VCI_STRING string depends on CMD_BOOTP diff --git a/cmd/pxe.c b/cmd/pxe.c index 704589702f2..21134eb7a30 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -141,6 +141,14 @@ int pxe_get(ulong pxefile_addr_r, char **bootdirp, ulong *sizep, bool use_ipv6) env_get("bootfile"), use_ipv6)) return -ENOMEM; + if (IS_ENABLED(CONFIG_BOOTP_PXE_DHCP_OPTION) && + pxelinux_configfile && !use_ipv6) { + if (pxe_dhcp_option_path(&ctx, pxefile_addr_r) > 0) + goto done; + + goto error_exit; + } + if (IS_ENABLED(CONFIG_DHCP6_PXE_DHCP_OPTION) && pxelinux_configfile && use_ipv6) { if (pxe_dhcp_option_path(&ctx, pxefile_addr_r) > 0) |