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

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

Browse Source 
Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	common/Kconfig
	configs/dms-ba16_defconfig
This commit is contained in:
Tom Rini
2016-10-28 11:12:03 -04:00
parent ec1eaad065 1c140f7bbf
commit 4f892924d2
86 changed files with 6262 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/Kconfig
View File

@@ -129,6 +129,13 @@ config ETHOC
help
This MAC is present in OpenRISC and Xtensa XTFPGA boards.
config FEC_MXC
bool "FEC Ethernet controller"
depends on MX6
help
This driver supports the 10/100 Fast Ethernet controller for
NXP i.MX processors.
config MVPP2
bool "Marvell Armada 375 network interface support"
depends on ARMADA_375