diff --git a/plat/imx/imx8mm/include/platform_def.h b/plat/imx/imx8mm/include/platform_def.h
index 3e26158..91f2e7f 100644
--- a/plat/imx/imx8mm/include/platform_def.h
+++ b/plat/imx/imx8mm/include/platform_def.h
@@ -44,13 +44,8 @@
 #define PLAT_VIRT_ADDR_SPACE_SIZE	(1ull << 32)
 #define PLAT_PHY_ADDR_SPACE_SIZE	(1ull << 32)
 
-#ifdef SPD_trusty
-#define MAX_XLAT_TABLES			5
-#define MAX_MMAP_REGIONS		13
-#else
-#define MAX_XLAT_TABLES			4
-#define MAX_MMAP_REGIONS		12
-#endif
+#define MAX_XLAT_TABLES			8
+#define MAX_MMAP_REGIONS		16
 
 #define HAB_RVT_BASE			0x00000900 /* HAB_RVT for i.MX8MM */