1From cbb09e400a5283e5b543e2b01b8c0038890a5260 Mon Sep 17 00:00:00 2001
2From: Xo Wang <xow@google.com>
3Date: Thu, 20 Oct 2016 17:42:13 -0700
4Subject: [PATCH 2/2] board/aspeed, aspeednic: Use MAC2 for networking
5
6Enable and select MAC2 for aspeednic.
7
8Signed-off-by: Xo Wang <xow@google.com>
9---
10 drivers/net/aspeednic.c       | 4 ++--
11 include/configs/ast-g5-ncsi.h | 1 +
12 2 files changed, 3 insertions(+), 2 deletions(-)
13
14diff --git a/drivers/net/aspeednic.c b/drivers/net/aspeednic.c
15index 8b85893..cff8370 100644
16--- a/drivers/net/aspeednic.c
17+++ b/drivers/net/aspeednic.c
18@@ -18,8 +18,8 @@
19 /* From the board config file */
20 #define CONFIG_MAC1_PHY_SETTING         2
21 #define CONFIG_MAC2_PHY_SETTING         0
22-#define CONFIG_ASPEED_MAC_NUMBER  1
23-#define CONFIG_ASPEED_MAC_CONFIG  1 // config MAC1
24+#define CONFIG_ASPEED_MAC_NUMBER  2
25+#define CONFIG_ASPEED_MAC_CONFIG  2 // config MAC2
26 #define _PHY_SETTING_CONCAT(mac) CONFIG_MAC##mac##_PHY_SETTING
27 #define _GET_MAC_PHY_SETTING(mac) _PHY_SETTING_CONCAT(mac)
28 #define CONFIG_ASPEED_MAC_PHY_SETTING \
29diff --git a/include/configs/ast-g5-ncsi.h b/include/configs/ast-g5-ncsi.h
30index f73a8f1..1408618 100644
31--- a/include/configs/ast-g5-ncsi.h
32+++ b/include/configs/ast-g5-ncsi.h
33@@ -22,6 +22,7 @@
34 /* Ethernet */
35 #define CONFIG_LIB_RAND
36 #define CONFIG_ASPEEDNIC
37+#define CONFIG_MAC2_ENABLE
38
39 /* platform.S settings */
40 #define	CONFIG_DRAM_ECC_SIZE		0x10000000
41--
422.8.0.rc3.226.g39d4020
43
44