summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2017-03-13 22:54:14 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 17:23:07 +0800
commit32147576237ff9e49c4314084a1e8b7a6fa5e27a (patch)
tree361e1052d389b556d3fd425ed8aec20c117be863 /board
parent3b0609ca267baaf6a78bebaccc6896e6508d1844 (diff)
downloadu-boot-imx-32147576237ff9e49c4314084a1e8b7a6fa5e27a.zip
u-boot-imx-32147576237ff9e49c4314084a1e8b7a6fa5e27a.tar.gz
u-boot-imx-32147576237ff9e49c4314084a1e8b7a6fa5e27a.tar.bz2
MLK-14418-13 imx: mx7dsabresd: Update Misc codes
1. Add BMODE support 2. Update environment variables to align with v2016.03 3. Remove the wdog WCR bit 4 clear. Since we have implemented reset_cpu for mx7d. Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx7dsabresd/mx7dsabresd.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index f5cb58f..fd60807 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -11,6 +11,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
#include <asm/imx-common/iomux-v3.h>
+#include <asm/imx-common/boot_mode.h>
#include <asm/io.h>
#include <linux/sizes.h>
#include <common.h>
@@ -597,6 +598,17 @@ int board_init(void)
return 0;
}
+#ifdef CONFIG_CMD_BMODE
+static const struct boot_mode board_boot_modes[] = {
+ /* 4 bit bus width */
+ {"sd1", MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)},
+ {"emmc", MAKE_CFGVAL(0x10, 0x2a, 0x00, 0x00)},
+ /* TODO: Nand */
+ {"qspi", MAKE_CFGVAL(0x00, 0x40, 0x00, 0x00)},
+ {NULL, 0},
+};
+#endif
+
#ifdef CONFIG_DM_PMIC
int power_init_board(void)
{
@@ -622,6 +634,9 @@ int power_init_board(void)
int board_late_init(void)
{
struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
+#ifdef CONFIG_CMD_BMODE
+ add_board_boot_modes(board_boot_modes);
+#endif
#ifdef CONFIG_ENV_IS_IN_MMC
board_late_mmc_env_init();
@@ -631,12 +646,6 @@ int board_late_init(void)
set_wdog_reset(wdog);
- /*
- * Do not assert internal WDOG_RESET_B_DEB(controlled by bit 4),
- * since we use PMIC_PWRON to reset the board.
- */
- clrsetbits_le16(&wdog->wcr, 0, 0x10);
-
return 0;
}