diff options
| author | John Wang <wangzqbj@inspur.com> | 2019-07-10 12:24:54 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-07-14 17:09:14 +0300 |
| commit | c2f3526c0facf9e247dc6855797ff9f271530471 (patch) | |
| tree | 41bb2660da1e844376f993c38f925f70defa9e6b /meta-phosphor/aspeed-layer | |
| parent | c153c314bdf3f322adc01f7233ea254284ca5971 (diff) | |
| download | openbmc-c2f3526c0facf9e247dc6855797ff9f271530471.tar.xz | |
u-boot-aspeed: Add distro feature for mac2 support
Add a distro feature to enable aspeed nic driver to enable MAC1
and MAC2.
The aspeednic patch is copied from meta-ingrasys/meta-zaius, it is
also required by fp5280g2. To avoid duplication, this distro feature
has been added.
Both meta-fp5280g2 and meta-zaius will be updated to use the distro feature.
Tested: tested on fp5280g2, and both Ethernet ports worked
(From meta-phosphor rev: 5a8e7c5a6efea492b82d710c465125fc9d0afdb9)
Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: Ia754595c5e3762f69397c03021ffe29ea5b9afcc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/aspeed-layer')
| -rw-r--r-- | meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch | 43 | ||||
| -rw-r--r-- | meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc | 3 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch new file mode 100644 index 000000000..2de2d8234 --- /dev/null +++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch @@ -0,0 +1,43 @@ +From cbb09e400a5283e5b543e2b01b8c0038890a5260 Mon Sep 17 00:00:00 2001 +From: Xo Wang <xow@google.com> +Date: Thu, 20 Oct 2016 17:42:13 -0700 +Subject: [PATCH 2/2] board/aspeed, aspeednic: Use MAC2 for networking + +Enable and select MAC2 for aspeednic. + +Signed-off-by: Xo Wang <xow@google.com> +--- + drivers/net/aspeednic.c | 4 ++-- + include/configs/ast-g5-ncsi.h | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/aspeednic.c b/drivers/net/aspeednic.c +index 8b85893..cff8370 100644 +--- a/drivers/net/aspeednic.c ++++ b/drivers/net/aspeednic.c +@@ -18,8 +18,8 @@ + /* From the board config file */ + #define CONFIG_MAC1_PHY_SETTING 2 + #define CONFIG_MAC2_PHY_SETTING 0 +-#define CONFIG_ASPEED_MAC_NUMBER 1 +-#define CONFIG_ASPEED_MAC_CONFIG 1 // config MAC1 ++#define CONFIG_ASPEED_MAC_NUMBER 2 ++#define CONFIG_ASPEED_MAC_CONFIG 2 // config MAC2 + #define _PHY_SETTING_CONCAT(mac) CONFIG_MAC##mac##_PHY_SETTING + #define _GET_MAC_PHY_SETTING(mac) _PHY_SETTING_CONCAT(mac) + #define CONFIG_ASPEED_MAC_PHY_SETTING \ +diff --git a/include/configs/ast-g5-ncsi.h b/include/configs/ast-g5-ncsi.h +index f73a8f1..1408618 100644 +--- a/include/configs/ast-g5-ncsi.h ++++ b/include/configs/ast-g5-ncsi.h +@@ -22,6 +22,7 @@ + /* Ethernet */ + #define CONFIG_LIB_RAND + #define CONFIG_ASPEEDNIC ++#define CONFIG_MAC2_ENABLE + + /* platform.S settings */ + #define CONFIG_DRAM_ECC_SIZE 0x10000000 +-- +2.8.0.rc3.226.g39d4020 + diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc index bc81be144..5329b2c89 100644 --- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc +++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc @@ -12,6 +12,9 @@ SRC_URI_append_aspeed_df-obmc-ubi-fs = " \ SRC_URI_append_aspeed_df-isolate-bmc = " \ file://0001-aspeed-Disable-unnecessary-features.patch \ " +SRC_URI_append_aspeed_df-aspeednic-use-mac2 = " \ + file://0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch \ + " do_patch[depends] += "os-release:do_populate_sysroot" |