[PATCH] ARM: sunxi: Enable GMAC in sunxi_defconfig

[PATCH] ARM: sunxi: Enable GMAC in sunxi_defconfig

[Maxime Ripard]

Since the support of the GMAC has been merged, we're using it as the ethernet
controller on the A20 devices.

However, sunxi_defconfig wasn't selecting it hence breaking the NFS boot.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/configs/sunxi_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index b5df4a511b0a..81ba78eaf54a 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -37,7 +37,7 @@ CONFIG_SUN4I_EMAC=y
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
 # CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_STMMAC_ETH=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_WLAN is not set
 CONFIG_SERIAL_8250=y
-- 
1.9.1

[PATCH] ARM: sunxi: Enable GMAC in sunxi_defconfig

[Maxime Ripard]

On Mon, Apr 28, 2014 at 11:44:36AM -0700, Maxime Ripard wrote:
> Since the support of the GMAC has been merged, we're using it as the ethernet
> controller on the A20 devices.
> 
> However, sunxi_defconfig wasn't selecting it hence breaking the NFS boot.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Applied to sunxi/fixes-for-3.15

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140501/9802a3df/attachment.sig>