apalis_t30: colibri_imx7: colibri_t30: fix ethernet functionality

Since commit aa7a648747d8c704a9a81c9e493d386930724e9d
("net: Stop including NFS overhead in defragment max") the following
has been reproducibly observed while trying to transfer data over TFTP:

Load address: 0x80408000
Loading: EHCI timed out on TD - token=0x8008d80
T EHCI timed out on TD - token=0x88008d80
Rx: failed to receive: -5

This patch fixes this by lowering our TFTP block size to be within the
standard maximal de-fragmentation aka IP packet size again.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 8c76605f8bc0deb863456fd6a0a4a014be8614d6..3fc177906bcfacb6b9d733dcd37e02312e7dc48f 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -52,7 +52,7 @@
 
 /* General networking support */
 #define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          16384
+#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 /* Miscellaneous commands */

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ba1adea364a96a885f87735b0a8e9389535f65ff..b628d11fe9df280a543b0dbc7ded898d51fbe7e1 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -44,9 +44,9 @@
 
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_MICREL
-#define CONFIG_TFTP_TSIZE
 #define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          16384
+#define CONFIG_TFTP_BLOCKSIZE          16352
+#define CONFIG_TFTP_TSIZE
 
 /* ENET1 */
 #define IMX_FEC_BASE                   ENET_IPS_BASE_ADDR

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 3431cde62fb7440bcfd5b55f139432dfcef588be..e2a2549fb65cad8cda812805a8b4c585123d25b9 100644 (file)
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -48,8 +48,7 @@
 
 /* General networking support */
 #define CONFIG_IP_DEFRAG
-#define CONFIG_NET_MAXDEFRAG           (16384 + 4096 + 24)
-#define CONFIG_TFTP_BLOCKSIZE          16384
+#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 /* Miscellaneous commands */