OPTEE-i.MX6UL

diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 2907e2a8e5..5b4db63ffc 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -199,7 +199,7 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->ram_size = imx_ddr_size();
+       gd->ram_size = imx_ddr_size() - 0x4000000;
 
        return 0;
 }
 
 diff --git a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts
index 1df3e376ae2c..20c6afb858e0 100644
--- a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts
+++ b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts
@@ -11,6 +11,13 @@
 / {
        model = "Engicam Is.IoT MX6UL eMMC Starter kit";
        compatible = "engicam,imx6ul-isiot", "fsl,imx6ul";
+
+       firmware {
+               optee {
+                       compatible = "linaro,optee-tz";
+                       method = "smc";
+               };
+       };
 };
 
 &usdhc2 {
diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi
index cc9adce638f5..464e5f204296 100644
--- a/arch/arm/boot/dts/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi
@@ -11,7 +11,7 @@
 / {
        memory@80000000 {
                device_type = "memory";
-               reg = <0x80000000 0x20000000>;
+               reg = <0x80000000 0x8000000>;
        };
 
        chosen {
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 2ccf67c4ac1a..efa426cb872a 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -788,6 +788,7 @@ crypto: crypto@2140000 {
                                clocks = <&clks IMX6UL_CLK_CAAM_IPG>, <&clks IMX6UL_CLK_CAAM_ACLK>,
                                         <&clks IMX6UL_CLK_CAAM_MEM>;
                                clock-names = "ipg", "aclk", "mem";
+                               status = "disabled";
 
                                sec_jr0: jr@1000 {
                                        compatible = "fsl,sec-v4.0-job-ring";
diff --git a/.shippable.yml b/.shippable.yml
index b120f376..2590a919 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -65,6 +65,7 @@ build:
     - _make PLATFORM=hikey
     - _make PLATFORM=hikey CFG_ARM64_core=y
     - _make PLATFORM=mediatek-mt8173 CFG_ARM64_core=y
+    - _make PLATFORM=imx-mx6ulisiot
     - _make PLATFORM=imx-mx6ulevk
     - _make PLATFORM=imx-mx6ulevk CFG_NXP_CAAM=y
     - _make PLATFORM=imx-mx6ul9x9evk
diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
index 1603aa6f..bb8b0c4c 100644
--- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk
@@ -5,6 +5,7 @@ mx6ul-flavorlist = \
        mx6ulevk \
        mx6ul9x9evk \
        mx6ulccimx6ulsbcpro \
+       mx6ulisiot \
 
 mx6ull-flavorlist = \
        mx6ullevk \
@@ -289,6 +290,11 @@ CFG_DDR_SIZE ?= 0x10000000
 CFG_NS_ENTRY_ADDR ?= 0x80800000
 endif
 
+ifneq (,$(filter $(PLATFORM_FLAVOR),mx6ulisiot))
+CFG_DDR_SIZE ?= 0x8000000
+CFG_NS_ENTRY_ADDR ?= 0x80800000
+endif
+
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx8mqevk))
 CFG_DDR_SIZE ?= 0xc0000000
 CFG_UART_BASE ?= UART1_BASE