Merge branch 'master' of git://git.denx.de/u-boot-mmc

[oweals/u-boot.git] / board / engicam / common / board.c

diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 8a83608c5b138857c5029568939525fab1a3d617..c7ec55ff825af8cdcc81f9a70898cb64d4930981 100644 (file)
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -15,23 +15,54 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-void mmc_late_init(void)
+static void mmc_late_init(void)
 {
        char cmd[32];
        char mmcblk[32];
        u32 dev_no = mmc_get_env_dev();
 
-       setenv_ulong("mmcdev", dev_no);
+       env_set_ulong("mmcdev", dev_no);
 
        /* Set mmcblk env */
        sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw", dev_no);
-       setenv("mmcroot", mmcblk);
+       env_set("mmcroot", mmcblk);
 
        sprintf(cmd, "mmc dev %d", dev_no);
        run_command(cmd, 0);
 }
 #endif
 
+int board_late_init(void)
+{
+       switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >>
+                       IMX6_BMODE_SHIFT) {
+       case IMX6_BMODE_SD:
+       case IMX6_BMODE_ESD:
+       case IMX6_BMODE_MMC:
+       case IMX6_BMODE_EMMC:
+#ifdef CONFIG_ENV_IS_IN_MMC
+               mmc_late_init();
+#endif
+               env_set("modeboot", "mmcboot");
+               break;
+       case IMX6_BMODE_NAND:
+               env_set("modeboot", "nandboot");
+               break;
+       default:
+               env_set("modeboot", "");
+               break;
+       }
+
+       if (is_mx6ul())
+               env_set("console", "ttymxc0");
+       else
+               env_set("console", "ttymxc3");
+
+       setenv_fdt_file();
+
+       return 0;
+}
+
 int board_init(void)
 {
        /* Address of boot parameters */