summaryrefslogtreecommitdiff
path: root/include/configs/colibri_imx7.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-09-30 21:58:44 -0400
committerTom Rini <trini@konsulko.com>2016-09-30 21:58:44 -0400
commitfe4ba689a0cb2bb2ceafb88556a57bd80814b648 (patch)
tree1012656ba1d3e9f8288d69de33c71417b2f22466 /include/configs/colibri_imx7.h
parentf413d1cae89143ad45b066b3d3bc602deafcb50a (diff)
parent4c043712e9910ef1d612aedbd8304a1f7348ef5f (diff)
downloadu-boot-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-usb
Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/dra7xx_evm.h
Diffstat (limited to 'include/configs/colibri_imx7.h')
-rw-r--r--include/configs/colibri_imx7.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index e911303788..16ae952f37 100644
--- 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