summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-07-09 12:23:38 +0800
committerPeng Fan <Peng.Fan@freescale.com>2015-07-09 12:27:01 +0800
commitb8760a10e7f55d50572fbb07ecc2608074a0051d (patch)
treea3b3c07812546cde2498a233d29e2a5c846fa76b /board
parent60586dcec668e5b863a21d7ca69a0325f405d6da (diff)
downloadu-boot-imx-b8760a10e7f55d50572fbb07ecc2608074a0051d.zip
u-boot-imx-b8760a10e7f55d50572fbb07ecc2608074a0051d.tar.gz
u-boot-imx-b8760a10e7f55d50572fbb07ecc2608074a0051d.tar.bz2
MLK-11227 imx: mx6ul_14x14_lpddr2_arm2 add weimnor defconfig
1. Add weimnor boot defconfig 2. move CONFIG_FSL_USDHC and CONFIG_VIDEO to board header 3. Add CONFIG_SYS_FLASH_PROTECTION for mx6ul 14x14 lpddr2 arm2 4. correct CONFIG_SYS_FLASH_SECT_SIZE and CONFIG_SYS_MAX_FLASH_SECT 5. Add comments for setup_eimnor, since ENET2_RXER pin conflicts with ENET2. Also eimnor support will disable SD1/SD2, need ENET to boot kernel and nfs using enet. So setup_eimnor should be invoked after setup_fec Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c b/board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c
index 251364d..e37e870 100644
--- a/board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c
+++ b/board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c
@@ -892,6 +892,12 @@ int board_init(void)
#endif
#ifdef CONFIG_SYS_USE_EIMNOR
+ /*
+ * This function should be invoked after setup_fec,
+ * because ENET2_RX_ER conflicts. However, we rarely need
+ * ENET2_RX_ER for enet, and when use eimnor, we do not
+ * have sd1/sd2, enet is a must to boot kernel and nfsrootfs.
+ */
setup_eimnor();
#endif