Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c
index 10a947173032e510ccb9da8a3dcfee1938e2777c..01148894c3f4ca51aaf82f81de8b8e671b4816de 100644 (file)
--- a/board/engicam/icorem6_rqs/icorem6_rqs.c
+++ b/board/engicam/icorem6_rqs/icorem6_rqs.c
@@ -27,17 +27,16 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_ENV_IS_IN_MMC
 int board_mmc_get_env_dev(int devno)
 {
-       /* dev 0 for SD/eSD, dev 1 for MMC/eMMC */
-       return (devno == 3) ? 1 : 0;
+       return devno;
 }
 #endif
 
 void setenv_fdt_file(void)
 {
        if (is_mx6dq())
-               setenv("fdt_file", "imx6q-icore-rqs.dtb");
+               env_set("fdt_file", "imx6q-icore-rqs.dtb");
        else if(is_mx6dl() || is_mx6solo())
-               setenv("fdt_file", "imx6dl-icore-rqs.dtb");
+               env_set("fdt_file", "imx6dl-icore-rqs.dtb");
 }
 
 #ifdef CONFIG_SPL_BUILD