From caa2ad6f8c8cc4c295c77aaff464c580d52c3ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alvin=20=C5=A0ipraga?= Date: Thu, 2 Oct 2025 11:43:36 +0200 Subject: tftp: make TFTP ports unconditionally configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A few lines of code being guarded by the CONFIG_TFTP_PORT option seems an unnecessary restriction on the TFTP support provided by a vanilla U-Boot image. In cases where the TFTP server cannot run as superuser - and hence cannot run on the well-known port 69 - this quirk incurs a full reconfiguration and rebuild of the bootloader only in order to select the appropriate destination port. Remove the CONFIG_TFTP_PORT option entirely and make the tftpdstp and tftpsrcp variables always have an effect. Their being unset will mean that U-Boot behaves the same as if CONFIG_TFTP_PORT was unset. Update the documentation accordingly. And fix up the single board which was originally enabling this option. Signed-off-by: Alvin Šipraga Reviewed-by: Quentin Schulz --- doc/usage/cmd/tftpput.rst | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'doc') 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. -- cgit v1.2.3 From efaadc02b736da82ef9868d11960a63faae9b3fe Mon Sep 17 00:00:00 2001 From: Beiyan Yun Date: Tue, 23 Sep 2025 15:12:59 +0800 Subject: doc: bindings: fix aquantia-phy.txt typo Fix typo: "weays" -> "ways" Signed-off-by: Beiyan Yun --- doc/device-tree-bindings/net/aquantia-phy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') 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. -- cgit v1.2.3