summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dufour2013-01-14 15:32:32 +0100
committerOlivier Dufour2013-01-15 12:43:48 +0100
commit48c1f7800849c2bb5e307661794e4e6fbbc2325e (patch)
treec43e2f4a42ddf55fa838858c02d29c3ca0cd9d84
parent8902c75d8cd9e8f1c766b2ac13ecd6ac7f39cdc9 (diff)
cleo/uboot: configure ethernet MAC only if enabled in pkg_cfg, closes #3682
-rw-r--r--cleopatre/u-boot-1.1.6/cpu/spc300/mseeth.S11
1 files changed, 11 insertions, 0 deletions
diff --git a/cleopatre/u-boot-1.1.6/cpu/spc300/mseeth.S b/cleopatre/u-boot-1.1.6/cpu/spc300/mseeth.S
index 26d513ceaf..ba282a959c 100644
--- a/cleopatre/u-boot-1.1.6/cpu/spc300/mseeth.S
+++ b/cleopatre/u-boot-1.1.6/cpu/spc300/mseeth.S
@@ -104,6 +104,10 @@ ethernet_config:
setreg RB_CLK_CMD_ETH1_RMII_OFFSET, CLK_CMD_OFF, r0, r1
checkreg RB_CLK_STAT_ETH1_RMII_OFFSET, CLK_ETH_RMII_IS_OFF, r0, r1
+ /* Check if eth2 is enabled */
+ getmode r2, NVRAM_ETH2_DISABLE_SHIFT, NVRAM_ETH2_DISABLE_MASK
+ cmp r2, #NVRAM_ETH2_DISABLED
+ beq 1f
setreg RB_CLK_CMD_ETH2_TX_OFFSET, CLK_CMD_OFF, r0, r1
checkreg RB_CLK_STAT_ETH2_TX_OFFSET, CLK_ETH_TX_RX_IS_OFF, r0, r1
setreg RB_CLK_CMD_ETH2_RX_OFFSET, CLK_CMD_OFF, r0, r1
@@ -111,6 +115,7 @@ ethernet_config:
setreg RB_CLK_CMD_ETH2_RMII_OFFSET, CLK_CMD_OFF, r0, r1
checkreg RB_CLK_STAT_ETH2_RMII_OFFSET, CLK_ETH_RMII_IS_OFF, r0, r1
+1:
/*
* Enable PHY Clock
*/
@@ -130,6 +135,12 @@ ethernet_config:
modebranch r2
.Lethtwo:
+ /* Check if eth2 is enabled */
+ getmode r2, NVRAM_ETH2_DISABLE_SHIFT, NVRAM_ETH2_DISABLE_MASK
+ cmp r2, #NVRAM_ETH2_DISABLED
+ bne 1f
+ endconfig r1, r2
+1:
getmode r2, NVRAM_ETH2_MODE_SHIFT, NVRAM_ETH2_MODE_MASK
modebranch r2