Merge changes from topic "st_clock_updates" into integration
* changes:
fix(st-clock): correct types in error messages
refactor(st-clock): directly use oscillator name
feat(st-clock): check HSE configuration in serial boot
feat(st-clock): manage disabled oscillator
refactor(st-clock): improve DT parsing for PLL nodes
diff --git a/plat/imx/imx8m/imx8mp/include/platform_def.h b/plat/imx/imx8m/imx8mp/include/platform_def.h
index 14b7ea0..486c1ee 100644
--- a/plat/imx/imx8m/imx8mp/include/platform_def.h
+++ b/plat/imx/imx8m/imx8mp/include/platform_def.h
@@ -36,10 +36,10 @@
#define PLAT_STOP_OFF_STATE U(3)
#if defined(NEED_BL2)
-#define BL2_BASE U(0x960000)
-#define BL2_LIMIT U(0x980000)
-#define BL31_BASE U(0x940000)
-#define BL31_LIMIT U(0x960000)
+#define BL2_BASE U(0x970000)
+#define BL2_LIMIT U(0x990000)
+#define BL31_BASE U(0x950000)
+#define BL31_LIMIT U(0x970000)
#define IMX_FIP_BASE U(0x40310000)
#define IMX_FIP_SIZE U(0x000300000)
#define IMX_FIP_LIMIT U(FIP_BASE + FIP_SIZE)
@@ -49,8 +49,8 @@
#define PLAT_IMX8MP_BOOT_MMC_BASE U(0x30B50000) /* SD */
#else
-#define BL31_BASE U(0x960000)
-#define BL31_LIMIT U(0x980000)
+#define BL31_BASE U(0x970000)
+#define BL31_LIMIT U(0x990000)
#endif
#define PLAT_PRI_BITS U(3)