summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-12-13 15:33:41 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 14:06:25 +0800
commit5fa7d431db1c5eda903f211a99c426d8d57293bd (patch)
treed7e17ae0359219308ebbb3d4655448963313e3c7 /board
parentff00dc24522677de858956ef5fea93f0f0abb5b8 (diff)
downloadu-boot-imx-5fa7d431db1c5eda903f211a99c426d8d57293bd.zip
u-boot-imx-5fa7d431db1c5eda903f211a99c426d8d57293bd.tar.gz
u-boot-imx-5fa7d431db1c5eda903f211a99c426d8d57293bd.tar.bz2
MLK-13602-3 mx6ullevk/arm2: Enable module fuse checking for mx6ull boards
Enable the module disable fuse checking configurations, and ENET fuse checking during ENET setup. Signed-off-by: Ye Li <ye.li@nxp.com> Tested-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit d2192a3909be8ab9433082e7c04c917489b28e25)
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c5
-rw-r--r--board/freescale/mx6ullevk/mx6ullevk.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c b/board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c
index 58c354d..8cfe2e3 100644
--- a/board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c
+++ b/board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c
@@ -784,6 +784,8 @@ static int setup_fec(int fec_id)
int ret;
if (0 == fec_id) {
+ if (check_module_fused(MX6_MODULE_ENET1))
+ return -1;
/*
* Use 50M anatop loopback REF_CLK1 for ENET1,
* clear gpr1[13], set gpr1[17]
@@ -795,6 +797,9 @@ static int setup_fec(int fec_id)
return ret;
} else {
+ if (check_module_fused(MX6_MODULE_ENET2))
+ return -1;
+
/* clk from phy, set gpr1[14], clear gpr1[18]*/
clrsetbits_le32(&iomuxc_gpr_regs->gpr[1], IOMUX_GPR1_FEC2_MASK,
IOMUX_GPR1_FEC2_CLOCK_MUX2_SEL_MASK);
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index fce1f39..aef4ce9 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -312,6 +312,9 @@ static int setup_fec(int fec_id)
int ret;
if (fec_id == 0) {
+ if (check_module_fused(MX6_MODULE_ENET1))
+ return -1;
+
/*
* Use 50M anatop loopback REF_CLK1 for ENET1,
* clear gpr1[13], set gpr1[17].
@@ -319,6 +322,9 @@ static int setup_fec(int fec_id)
clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC1_MASK,
IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK);
} else {
+ if (check_module_fused(MX6_MODULE_ENET2))
+ return -1;
+
/*
* Use 50M anatop loopback REF_CLK2 for ENET2,
* clear gpr1[14], set gpr1[18].