leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-sunxi

Browse Source
This commit is contained in:
Tom Rini
2017-12-19 07:57:33 -05:00
parent 5f77083628 23cd00ab2d
commit 76cc372879
29 changed files with 336 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
board/sunxi/MAINTAINERS
View File

@@ -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

4
board/sunxi/gmac.c
View File

@@ -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))