From e5ac66df336a1ce45f315ada5d8f1a73e8f22632 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Tue, 15 Mar 2016 22:16:54 +0800 Subject: [PATCH] MLK-12483-5 mx6ul: Enable module fuse check EVK board Enable the configurations CONFIG_MODULE_FUSE and CONFIG_OF_SYSTEM_SETUP for module fuse check. And modify board level codes for SD, FEC and EIM. Signed-off-by: Ye Li (cherry picked from commit 9232e9f7637afa3b71b43ab2d1361582ec5a080a) (cherry picked from commit 687b586bf7d3b0d2f796c8ea768e4fb450079adb) (cherry picked from commit f1cdd3b004b15d950b35f3ef625af23c2f106f5a) --- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 6 ++++++ include/configs/mx6ul_14x14_evk.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 31260dc681..c0ff2954f3 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -498,6 +498,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]. @@ -505,6 +508,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]. diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index fdb54f958c..99a67a8aa5 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -284,4 +284,6 @@ #endif #endif +#define CONFIG_MODULE_FUSE +#define CONFIG_OF_SYSTEM_SETUP #endif -- 2.17.1