commit e43fb06653b8abe6834d47ee8f1546cd9fb90280
author Eli Nidam <elini@marvell.com> Sun Jul 14 16:22:28 2013 +0300
committer Aaron Germuth <germuth@google.com> Fri Dec 09 13:57:25 2016 -0800
tree 99d85749b40bed1dc92a3be27712cbdd2507685c
parent 678675f38e1d30f163c4cbd21fe3d230a452d885

Marvell SGMII patch: Fixed module output print

Marvell gave us an update to uboot for thunderbolt:
SDK_2.7.25_thunderbolt_v1.

Adding all their uboot changes would be unnecessary and high risk,
low reward. For this reason, we are only applying the minimal set
of changes to get SGMII working.

This patch comes from SDK_2.7.25_thunderbolt_v1 and is a required
precursor to be able to apply the one we really want:

"MHSLPONLGCY-151 Add SGMII support on GMAC1"

which is applied in go/fibercl/82370

Change-Id: Id6f62ada30c1a69a91c6cb43d9475457de902290
Signed-off-by: Eli Nidam <elini@marvell.com>

board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvLib.c

diff --git a/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvLib.c b/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvLib.c
index 48f19b4..6aab4bd 100644
--- a/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvLib.c
+++ b/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvLib.c
@@ -2296,7 +2296,23 @@
 		mvOsOutput("       3xFE PHY Module.\n");
 
 	/* Internal FE/GE Phy */
-	if (ethConfig & (ESC_OPT_GEPHY_MAC0 | ESC_OPT_GEPHY_MAC1 | ESC_OPT_GEPHY_SW_P0 | ESC_OPT_GEPHY_SW_P5 )) {
+	if (DB_88F6601_BP_ID == mvBoardIdGet()) {
+		if (ethConfig & ESC_OPT_GEPHY_MAC0) {
+			mvOsOutput("       GE-PHY on MAC0.\n");
+			mvOsOutput("       LP SERDES on MAC1.\n");
+		}
+		else {
+			mvOsOutput("       LP SERDES on MAC0.\n");
+			mvOsOutput("       MAC1 disconnected.\n");
+		}
+		/* LP SERDES  for DB 6601 */
+		if (ethConfig & ESC_OPT_LP_SERDES_FE_GE_PHY)
+			mvOsOutput("       LP SERDES connected to external PHY.\n");
+		else
+			mvOsOutput("       LP SERDES connected to SFP.\n");
+		return;
+	}
+	else if (ethConfig & (ESC_OPT_GEPHY_MAC0 | ESC_OPT_GEPHY_MAC1 | ESC_OPT_GEPHY_SW_P0 | ESC_OPT_GEPHY_SW_P5 )) {
 		if (ethConfig & ESC_OPT_GEPHY_MAC0) 
 			mvOsOutput("       GE-PHY on MAC0.\n");
 		if (ethConfig & ESC_OPT_GEPHY_MAC1)
@@ -2323,13 +2339,6 @@
 	if (ethConfig & ESC_OPT_SGMII_2_5)
 		mvOsOutput("       SGMII-2.5G Module.\n");
 
-	/* LP SERDES  for DB 6601 */
-	if (DB_88F6601_BP_ID == mvBoardIdGet()) {
-		if (ethConfig & ESC_OPT_GEPHY_MAC0) 
-			mvOsOutput("       LP SERDES on MAC1.\n");
-		else
-			mvOsOutput("       LP SERDES on MAC0.\n");
-	}
 
 
 	return;