Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / board / sunxi / gmac.c

diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
index 69eb8ff2d921170817b0e3d12c9ad9472c75045e..826650c89bc10d7a2a9fc730828af4846cfa0762 100644 (file)
--- a/board/sunxi/gmac.c
+++ b/board/sunxi/gmac.c
@@ -33,7 +33,11 @@ void eth_init_board(void)
 
 #ifndef CONFIG_MACH_SUN6I
        /* Configure pin mux settings for GMAC */
+#ifdef CONFIG_SUN7I_GMAC_FORCE_TXERR
+       for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(17); pin++) {
+#else
        for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
+#endif
 #ifdef CONFIG_RGMII
                /* skip unused pins in RGMII mode */
                if (pin == SUNXI_GPA(9) || pin == SUNXI_GPA(14))