diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index dc02450..c31f75b 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -248,6 +248,7 @@ static int ft_add_optee_node(void *fdt, bd_t *bd)
 
 int ft_system_setup(void *blob, bd_t *bd)
 {
+#ifdef CONFIG_IMX8MQ
 	int i = 0;
 	int rc;
 	int nodeoff;
@@ -339,6 +340,7 @@ usb_modify_speed:
 			       "cpu-idle-states");
 		}
 	}
+#endif
 
 	return ft_add_optee_node(blob, bd);
 }
diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c
index 9d57b3b..9fec297 100644
--- a/board/freescale/imx8mm_evk/imx8mm_evk.c
+++ b/board/freescale/imx8mm_evk/imx8mm_evk.c
@@ -135,7 +135,11 @@ int board_postclk_init(void)
 
 int dram_init(void)
 {
-	gd->ram_size = PHYS_SDRAM_SIZE;
+	/* rom_pointer[1] contains the size of TEE occupies */
+	if (rom_pointer[1])
+		gd->ram_size = PHYS_SDRAM_SIZE - rom_pointer[1];
+	else
+		gd->ram_size = PHYS_SDRAM_SIZE;
 
 	return 0;
 }
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 366ee02..ae1dd6f 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -316,4 +316,6 @@
 
 #endif
 
+#define CONFIG_OF_SYSTEM_SETUP
+
 #endif