diff --git a/board/embedian/smarcfimx7/ddr3l/mx7d_2x_k4b4g1646q.cfg b/board/embedian/smarcfimx7/ddr3l/mx7d_2x_k4b4g1646q.cfg
index aaeeb05..b792e4f 100644
--- a/board/embedian/smarcfimx7/ddr3l/mx7d_2x_k4b4g1646q.cfg
+++ b/board/embedian/smarcfimx7/ddr3l/mx7d_2x_k4b4g1646q.cfg
@@ -21,8 +21,12 @@ IMAGE_VERSION 2
  * spi/sd/nand/onenand, qspi/nor
  */
 
-BOOT_FROM	spi
+BOOT_FROM	sd
 
+#ifdef CONFIG_USE_IMXIMG_PLUGIN
+/*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
+PLUGIN  board/freescale/mx7dsabresd/plugin.bin 0x00910000
+#else
 /*
  * Secure boot support
  */
@@ -42,6 +46,10 @@ CSF CONFIG_CSF_SIZE
  *	value	  value to be stored in the register
  */
 
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x30340024 0x1
+CHECK_BITS_SET 4 0x30340024 0x1
+#endif
 /* IOMUXC_GPR_GPR1 */
 DATA 4 0x30340004 0x4F400005
 /* Clear then set bit30 to ensure exit from DDR retention */
@@ -152,3 +160,5 @@ DATA 4 0x30790018 0x0000000f
 
 /* DDRC_STAT */
 CHECK_BITS_SET 4 0x307a0004 0x1
+
+#endif
diff --git a/board/embedian/smarcfimx7/ddr3l/mx7d_2x_mt41k512m16ha.cfg b/board/embedian/smarcfimx7/ddr3l/mx7d_2x_mt41k512m16ha.cfg
index 78467b7..4c6a9af 100644
--- a/board/embedian/smarcfimx7/ddr3l/mx7d_2x_mt41k512m16ha.cfg
+++ b/board/embedian/smarcfimx7/ddr3l/mx7d_2x_mt41k512m16ha.cfg
@@ -21,8 +21,12 @@ IMAGE_VERSION 2
  * spi/sd/nand/onenand, qspi/nor
  */
 
-BOOT_FROM	spi
+BOOT_FROM	sd
 
+#ifdef CONFIG_USE_IMXIMG_PLUGIN
+/*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
+PLUGIN  board/freescale/mx7dsabresd/plugin.bin 0x00910000
+#else
 /*
  * Secure boot support
  */
@@ -42,6 +46,10 @@ CSF CONFIG_CSF_SIZE
  *	value	  value to be stored in the register
  */
 
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x30340024 0x1
+CHECK_BITS_SET 4 0x30340024 0x1
+#endif
 /* IOMUXC_GPR_GPR1 */
 DATA 4 0x30340004 0x4F400005
 /* Clear then set bit30 to ensure exit from DDR retention */
@@ -152,3 +160,5 @@ DATA 4 0x30790018 0x0000000f
 
 /* DDRC_STAT */
 CHECK_BITS_SET 4 0x307a0004 0x1
+
+#endif
diff --git a/board/embedian/smarcfimx7/ddr3l/mx7s_2x_k4b2g1646q.cfg b/board/embedian/smarcfimx7/ddr3l/mx7s_2x_k4b2g1646q.cfg
index 44e6f38..0c8e29a 100644
--- a/board/embedian/smarcfimx7/ddr3l/mx7s_2x_k4b2g1646q.cfg
+++ b/board/embedian/smarcfimx7/ddr3l/mx7s_2x_k4b2g1646q.cfg
@@ -21,8 +21,12 @@ IMAGE_VERSION 2
  * spi/sd/nand/onenand, qspi/nor
  */
 
-BOOT_FROM	spi
+BOOT_FROM	sd
 
+#ifdef CONFIG_USE_IMXIMG_PLUGIN
+/*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
+PLUGIN  board/freescale/mx7dsabresd/plugin.bin 0x00910000
+#else
 /*
  * Secure boot support
  */
@@ -42,6 +46,10 @@ CSF CONFIG_CSF_SIZE
  *	value	  value to be stored in the register
  */
 
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x30340024 0x1
+CHECK_BITS_SET 4 0x30340024 0x1
+#endif
 /* IOMUXC_GPR_GPR1 */
 DATA 4 0x30340004 0x4F400005
 /* Clear then set bit30 to ensure exit from DDR retention */
@@ -152,3 +160,5 @@ DATA 4 0x30790018 0x0000000f
 
 /* DDRC_STAT */
 CHECK_BITS_SET 4 0x307a0004 0x1
+
+#endif