Split Armada into clearfogbase nad clearfogpro

This commit is contained in:
zador-blood-stained 2016-12-09 14:27:04 +03:00
parent 1e8ca2f089
commit 099bfb6e2e
5 changed files with 56 additions and 2 deletions

View File

@ -1,5 +1,5 @@
# Marvell Armada 38x
BOARD_NAME="Clearfog"
# Marvell Armada 38x 1x mPCIe M.2 2xGBE SFP
BOARD_NAME="Clearfog Base"
LINUXFAMILY="marvell"
BOOTCONFIG="armada_38x_clearfog_config"
MODULES=""

View File

@ -0,0 +1,15 @@
# Marvell Armada 38x 2x mPCIe M.2 BBE Switch SFP
BOARD_NAME="Clearfog Pro"
LINUXFAMILY="marvell"
BOOTCONFIG="armada_38x_clearfog_config"
MODULES=""
MODULES_NEXT="mv_cesa"
MODULES_DEV="mv_cesa"
CLI_TARGET="jessie,xenial:default,next"
KERNEL_TARGET="default,next,dev"
#
BOARDRATING=""
CHIP="http://docs.armbian.com/Hardware_Other/#marvel-armada-clearfog"
REVIEW="http://forum.armbian.com/index.php/topic/590-quick-review-of-solidruns-clearfog/"
HARDWARE="http://wiki.solid-run.com/doku.php?id=products:a38x"
FORUMS="http://forum.armbian.com/index.php/forum/11-other-boards/"

View File

@ -0,0 +1,39 @@
diff --git a/board/mv_ebu/a38x/armada_38x_family/boardEnv/mvBoardEnvSpec38x.c b/board/mv_ebu/a38x/armada_38x_family/boardEnv/mvBoardEnvSpec38x.c
index bfcc4c4..da5099c 100644
--- a/board/mv_ebu/a38x/armada_38x_family/boardEnv/mvBoardEnvSpec38x.c
+++ b/board/mv_ebu/a38x/armada_38x_family/boardEnv/mvBoardEnvSpec38x.c
@@ -222,7 +222,7 @@ MV_BOARD_MAC_INFO armada_38x_customer_1_BoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr ,
MV_32 boardEthSmiAddr0 , MV_BOOL boardMacEnabled;}} */
{ BOARD_MAC_SPEED_AUTO, 0x0, 0x0, MV_TRUE},
- { BOARD_MAC_SPEED_1000M, -1, -1, MV_TRUE},
+ { BOARD_MAC_SPEED_AUTO, -1, -1, MV_TRUE},
{ BOARD_MAC_SPEED_AUTO, -1, -1, MV_TRUE}
};
@@ -293,14 +293,10 @@ MV_BOARD_IO_EXPANDER_TYPE_INFO armada_38x_customer_1_ioExpPinInfo[] = {
void a38x_customer_board_1_gpp_callback(MV_BOARD_INFO *board) {
int i;
- /* Toggle GPIO41 to reset onboard switch and phy */
- MV_REG_BIT_RESET (0x18140, 0x200);
- MV_REG_BIT_RESET (0x18144, 0x200);
/* GPIO 19 on ClearFog rev 2.1 controls the uSOM onboard phy reset */
MV_REG_BIT_RESET (0x18100, 0x00080000);
MV_REG_BIT_RESET (0x18104, 0x00080000);
mvOsDelay(1);
- MV_REG_BIT_SET (0x18140, 0x200);
MV_REG_BIT_SET (0x18100, 0x00080000);
mvOsDelay(10);
for (i = 0; i < board->numIoExp; i++) {
@@ -377,8 +373,8 @@ MV_BOARD_INFO armada_38x_customer_board_1_info = {
.pIoExp = armada_38x_customer_1_IoExpanderInfo,
.boardOptionsModule = MV_MODULE_NO_MODULE,
.isAmc = MV_FALSE,
- .pSwitchInfo = cfSwitchInfo,
- .switchInfoNum = ARRSZ(cfSwitchInfo)
+ .pSwitchInfo = NULL,
+ .switchInfoNum = 0
};
/*