diff options
| author | Tom Rini <[email protected]> | 2025-10-22 09:07:56 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-10-22 09:07:56 -0600 |
| commit | 29a96acaa3a84c68264d8dcf2182000bce71175e (patch) | |
| tree | abd59b96eeb5783eb0ec7bb43423c3910a328502 /doc | |
| parent | b21ba014a9e51ae33916ec17786fdb03587ed9b6 (diff) | |
| parent | ed6ec8d1ca0658d811df1cc78d06fec4f7f69fc9 (diff) | |
Merge tag 'net-20251022' of https://source.denx.de/u-boot/custodians/u-boot-net
Pull request net-20251022
net:
- airoha: improvements
- Tighten a few more driver dependencies
- designware: fix bitbang init error
- phy: Make driver overloading get_phy_id depend on !COMPILE_TEST
- phy: add paged PHY register accessors
- make dhcp_run() common for NET and NET_LWIP
- dwc_eth_ops: Correct check for FDT_64BIT
- mediatek: mt7988: various fixup + MDIO detach
- phy: aquantia: switch to use phy_get_ofnode(), fix bindings typo
net-legacy:
- bootp: Prevent buffer overflow to avoid leaking the RAM content
- tftp: make TFTP ports unconditionally configurable
misc:
- uthreads: Make use of CONFIG_IS_ENABLED consistently
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/device-tree-bindings/net/aquantia-phy.txt | 2 | ||||
| -rw-r--r-- | doc/usage/cmd/tftpput.rst | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/doc/device-tree-bindings/net/aquantia-phy.txt b/doc/device-tree-bindings/net/aquantia-phy.txt index 89ce61e05bb..7dd3d45df12 100644 --- a/doc/device-tree-bindings/net/aquantia-phy.txt +++ b/doc/device-tree-bindings/net/aquantia-phy.txt @@ -4,7 +4,7 @@ This text describes properties that are applicable to Aquantia PHY nodes in addition to the bindings in phy.txt. Aquantia PHYs allow some flexibility in the way they are wired in a system, -they allow MDI pins to be reversed, LEDs linked up in different weays, have an +they allow MDI pins to be reversed, LEDs linked up in different ways, have an I2C slave interface that can be used for debug. Normally the configuration corresponding to these is driven by the PHY firmware with the downside that a custom firmware is needed for each integration of a PHY. diff --git a/doc/usage/cmd/tftpput.rst b/doc/usage/cmd/tftpput.rst index 351c9faa38b..2bcb3032cb2 100644 --- a/doc/usage/cmd/tftpput.rst +++ b/doc/usage/cmd/tftpput.rst @@ -19,9 +19,8 @@ Description The tftpput command is used to transfer a file to a TFTP server. By default the destination port is 69 and the source port is pseudo-random. -If CONFIG_TFTP_PORT=y, the environment variable *tftpsrcp* can be used to set -the source port and the environment variable *tftpdstp* can be used to set -the destination port. +The environment variable *tftpsrcp* can be used to set the source port and the +environment variable *tftpdstp* can be used to set the destination port. address memory address where the data starts @@ -75,9 +74,6 @@ The command is only available if CONFIG_CMD_TFTPPUT=y. CONFIG_TFTP_BLOCKSIZE defines the size of the TFTP blocks sent. It defaults to 1468 matching an ethernet MTU of 1500. -If CONFIG_TFTP_PORT=y, the environment variables *tftpsrcp* and *tftpdstp* can -be used to set the source and the destination ports. - CONFIG_TFTP_WINDOWSIZE can be used to set the TFTP window size of transmits after which an ACK response is required. The window size defaults to 1. |
