diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-19 07:57:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-19 07:57:33 -0500 |
| commit | 76cc372879e2f2f0467e8a3875f097d189647793 (patch) | |
| tree | 73b2136d7b21c4fd351fd48cdf6b87ce229e7951 /board | |
| parent | 5f7708362812dc5c0647cdae4f05a85e57b3cf32 (diff) | |
| parent | 23cd00ab2d8c39eaa15257efcba441939ea66fa8 (diff) | |
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/MAINTAINERS | 5 | ||||
| -rw-r--r-- | board/sunxi/gmac.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 99809c6a1c..ee24d70913 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -286,6 +286,11 @@ M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained F: configs/nanopi_neo2_defconfig +NANOPI-NEO-PLUS2 BOARD +M: Antony Antony <antony@phenome.org> +S: Maintained +F: configs/nanopi_neo_plus2_defconfig + NANOPI-NEO-AIR BOARD M: Jelle van der Waa <jelle@vdwaa.nl> S: Maintained diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c index 69eb8ff2d9..826650c89b 100644 --- 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)) |