env: Rename common functions related to setenv()

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

diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index af4ef28dac9a3eea325aae4c8be2ea35a8059cb4..c7ec55ff825af8cdcc81f9a70898cb64d4930981 100644 (file)
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -21,11 +21,11 @@ static void mmc_late_init(void)
        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);
@@ -43,16 +43,21 @@ int board_late_init(void)
 #ifdef CONFIG_ENV_IS_IN_MMC
                mmc_late_init();
 #endif
-               setenv("modeboot", "mmcboot");
+               env_set("modeboot", "mmcboot");
                break;
        case IMX6_BMODE_NAND:
-               setenv("modeboot", "nandboot");
+               env_set("modeboot", "nandboot");
                break;
        default:
-               setenv("modeboot", "");
+               env_set("modeboot", "");
                break;
        }
 
+       if (is_mx6ul())
+               env_set("console", "ttymxc0");
+       else
+               env_set("console", "ttymxc3");
+
        setenv_fdt_file();
 
        return 0;