diff --git a/board/embedian/smarcfimx6/smarcfimx6.c b/board/embedian/smarcfimx6/smarcfimx6.c
index 63ef3cb..47344d7 100644
--- a/board/embedian/smarcfimx6/smarcfimx6.c
+++ b/board/embedian/smarcfimx6/smarcfimx6.c
@@ -1346,22 +1346,22 @@ int board_late_init(void)
         if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 0)) {
                 puts("BOOT_SEL Detected: OFF OFF OFF, Load zImage from Carrier SATA...\n");
                 env_set("root", "/dev/sda1 rootwait rw ");
-                env_set("bootcmd", "sata init; run findfdt; run loadsataenv; run importbootenv; run uenvcmd; run loadsatazimage; run loadsatafdt; run sataboot;");
+                env_set("bootcmd", "sata init; run loadsataenv; run importbootenv; run uenvcmd; run loadsatazimage; run loadsatafdt; run sataboot;");
         } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)) {
                 puts("BOOT_SEL Detected: OFF OFF ON, USB Boot Up Not Defined...Carrier SPI Boot Not Supported...\n");
                 hang();
         } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 0)) {
                 puts("BOOT_SEL Detected: OFF ON OFF, Load zImage from Carrier SDMMC...\n");
                 env_set_ulong("mmcdev", 1);
-                env_set("bootcmd", "mmc rescan; run findfdt; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
+                env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
         } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 0)) {
                 puts("BOOT_SEL Detected: ON OFF OFF, Load zImage from Carrier SD Card...\n");
                 env_set_ulong("mmcdev", 0);
-                env_set("bootcmd", "mmc rescan; run findfdt; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
+                env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
         } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)) {
                 puts("BOOT_SEL Detected: OFF ON ON, Load zImage from Module eMMC Flash...\n");
                 env_set_ulong("mmcdev", 2);
-                env_set("bootcmd", "mmc rescan; run findfdt; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
+                env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
         } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)) {
                 puts("BOOT_SEL Detected: ON OFF ON, Load zImage from GBE...\n");
                 env_set("bootcmd", "run netboot;");
@@ -1371,7 +1371,7 @@ int board_late_init(void)
         } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)) {
                 puts("BOOT_SEL Detected: ON ON ON, MOdule SPI Boot up is Default, Load zImage from Module eMMC...\n");
                 env_set_ulong("mmcdev", 2);
-                env_set("bootcmd", "mmc rescan; run findfdt; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
+                env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
         } else {
                 puts("unsupported boot devices\n");
                 hang();
diff --git a/configs/smarcfimx6_dl_1g_ser0_android_defconfig b/configs/smarcfimx6_dl_1g_ser0_android_defconfig
index e511977..9019dd8 100644
--- a/configs/smarcfimx6_dl_1g_ser0_android_defconfig
+++ b/configs/smarcfimx6_dl_1g_ser0_android_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_dl_1g_ser0_defconfig b/configs/smarcfimx6_dl_1g_ser0_defconfig
index 4938cc2..21852aa 100644
--- a/configs/smarcfimx6_dl_1g_ser0_defconfig
+++ b/configs/smarcfimx6_dl_1g_ser0_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_dl_1g_ser1_android_defconfig b/configs/smarcfimx6_dl_1g_ser1_android_defconfig
index 8be7077..b1d1e63 100644
--- a/configs/smarcfimx6_dl_1g_ser1_android_defconfig
+++ b/configs/smarcfimx6_dl_1g_ser1_android_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_dl_1g_ser1_defconfig b/configs/smarcfimx6_dl_1g_ser1_defconfig
index d32b663..0ad1798 100644
--- a/configs/smarcfimx6_dl_1g_ser1_defconfig
+++ b/configs/smarcfimx6_dl_1g_ser1_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_dl_1g_ser2_android_defconfig b/configs/smarcfimx6_dl_1g_ser2_android_defconfig
index 4462a55..b389384 100644
--- a/configs/smarcfimx6_dl_1g_ser2_android_defconfig
+++ b/configs/smarcfimx6_dl_1g_ser2_android_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_dl_1g_ser2_defconfig b/configs/smarcfimx6_dl_1g_ser2_defconfig
index 17826c2..1857406 100644
--- a/configs/smarcfimx6_dl_1g_ser2_defconfig
+++ b/configs/smarcfimx6_dl_1g_ser2_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_dl_1g_ser3_android_defconfig b/configs/smarcfimx6_dl_1g_ser3_android_defconfig
index 5850ec8..0e18d63 100644
--- a/configs/smarcfimx6_dl_1g_ser3_android_defconfig
+++ b/configs/smarcfimx6_dl_1g_ser3_android_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_dl_1g_ser3_defconfig b/configs/smarcfimx6_dl_1g_ser3_defconfig
index 7789b35..417a430 100644
--- a/configs/smarcfimx6_dl_1g_ser3_defconfig
+++ b/configs/smarcfimx6_dl_1g_ser3_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_solo_ser0_android_defconfig b/configs/smarcfimx6_solo_ser0_android_defconfig
index d04661a..7a308a4 100644
--- a/configs/smarcfimx6_solo_ser0_android_defconfig
+++ b/configs/smarcfimx6_solo_ser0_android_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_solo_ser0_defconfig b/configs/smarcfimx6_solo_ser0_defconfig
index 799f520..7d57e76 100644
--- a/configs/smarcfimx6_solo_ser0_defconfig
+++ b/configs/smarcfimx6_solo_ser0_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_solo_ser1_android_defconfig b/configs/smarcfimx6_solo_ser1_android_defconfig
index 397f5e7..55c1d35 100644
--- a/configs/smarcfimx6_solo_ser1_android_defconfig
+++ b/configs/smarcfimx6_solo_ser1_android_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_solo_ser1_defconfig b/configs/smarcfimx6_solo_ser1_defconfig
index c5563a2..6013e71 100644
--- a/configs/smarcfimx6_solo_ser1_defconfig
+++ b/configs/smarcfimx6_solo_ser1_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_solo_ser2_android_defconfig b/configs/smarcfimx6_solo_ser2_android_defconfig
index 4674a74..c077e76 100644
--- a/configs/smarcfimx6_solo_ser2_android_defconfig
+++ b/configs/smarcfimx6_solo_ser2_android_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_solo_ser2_defconfig b/configs/smarcfimx6_solo_ser2_defconfig
index c68b98d..5a56f6b 100644
--- a/configs/smarcfimx6_solo_ser2_defconfig
+++ b/configs/smarcfimx6_solo_ser2_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_solo_ser3_android_defconfig b/configs/smarcfimx6_solo_ser3_android_defconfig
index a4bc0f7..370ae4d 100644
--- a/configs/smarcfimx6_solo_ser3_android_defconfig
+++ b/configs/smarcfimx6_solo_ser3_android_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/configs/smarcfimx6_solo_ser3_defconfig b/configs/smarcfimx6_solo_ser3_defconfig
index d1a24e0..9b5a2ec 100644
--- a/configs/smarcfimx6_solo_ser3_defconfig
+++ b/configs/smarcfimx6_solo_ser3_defconfig
@@ -45,8 +45,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
 
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
-CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
+CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
 CONFIG_OF_CONTROL=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git a/include/configs/smarcfimx6_common.h b/include/configs/smarcfimx6_common.h
index 45ae4c8..628494b 100644
--- a/include/configs/smarcfimx6_common.h
+++ b/include/configs/smarcfimx6_common.h
@@ -122,7 +122,7 @@
 		CONFIG_MFG_ENV_SETTINGS \
 		TEE_ENV \
 		"image=zImage\0" \
-		"fdt_file=undefined\0" \
+        	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 		"fdt_addr=0x18000000\0" \
 		"fdt_high=0xffffffff\0"   \
 		"tee_addr=0x20000000\0" \
@@ -166,9 +166,8 @@
 		"bootargs_sata=setenv bootargs ${bootargs} " \
 			"root=/dev/sda2 rootwait rw \0" \
 		"bootcmd_sata=run bootargs_sata; sata init; " \
-			"run findfdt; run findtee;" \
 			"fatload sata 0:1 ${loadaddr} ${image}; " \
-			"fatload sata 0:1 ${fdt_addr} ${fdt_file}; " \
+			"fatload sata 0:1 ${fdt_addr} /dtbs/${fdt_file}; " \
 			"if test ${tee} = yes; then " \
 				"fatload sata 0:1 ${tee_addr} ${tee_file}; " \
 				"bootm ${tee_addr} - ${fdt_addr}; " \
@@ -185,7 +184,7 @@
 	"epdc_waveform=epdc_splash.bin\0" \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
-	"fdt_file=undefined\0" \
+        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_addr=0x18000000\0" \
 	"tee_addr=0x20000000\0" \
 	"tee_file=undefined\0" \
@@ -353,8 +352,6 @@
 			"fi;\0" \
 
 #define CONFIG_BOOTCOMMAND \
-	"run findfdt;" \
-	"run findtee;" \
        	"if mmc rescan; then " \
                	"echo SD/MMC found on device ${mmcdev};" \
                	"if run loadbootenv; then " \