diff options
| author | Tom Rini <[email protected]> | 2026-02-04 08:05:24 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-02-04 08:05:24 -0600 |
| commit | eb1562cc3e4c5130c76db1c1ea57156322362a7c (patch) | |
| tree | ba5d95a9e4401433f460db33c3df0c265e2e45db /include | |
| parent | 3c72973b7a7fbc3f57b20bf2e2e630ba9d31a686 (diff) | |
| parent | f0a1eb8a3d13112f69c69b4c4752147cebe66900 (diff) | |
Merge tag 'net-20260204' of https://source.denx.de/u-boot/custodians/u-boot-net
Pull request net-20260204.
net:
- phy: aquantia: add support for Marvell CUX3410 10Gb PHY
- drivers: phy: fix code documentation typo udevice_ops
net-lwip:
- Command fixes and improvements (dhcp, dns, nfs)
- dhcp, tftp: do not write past end of buffer
- Add TFTPSERVERIP Kconfig option
misc:
- Update Jerome's email address
Diffstat (limited to 'include')
| -rw-r--r-- | include/env_default.h | 3 | ||||
| -rw-r--r-- | include/generic-phy.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/env_default.h b/include/env_default.h index 7f8dc1c35a7..014873e304d 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -58,6 +58,9 @@ const char default_environment[] = { #ifdef CONFIG_USE_SERVERIP "serverip=" CONFIG_SERVERIP "\0" #endif +#ifdef CONFIG_USE_TFTPSERVERIP + "tftpserverip=" CONFIG_TFTPSERVERIP "\0" +#endif #ifdef CONFIG_SYS_DISABLE_AUTOLOAD "autoload=0\0" #endif diff --git a/include/generic-phy.h b/include/generic-phy.h index ba3321f4849..567dd3974ad 100644 --- a/include/generic-phy.h +++ b/include/generic-phy.h @@ -52,7 +52,7 @@ struct phy { }; /* - * struct udevice_ops - set of function pointers for phy operations + * struct phy_ops - set of function pointers for phy operations * @init: operation to be performed for initializing phy (optional) * @exit: operation to be performed while exiting (optional) * @reset: reset the phy (optional). |