Merge changes from topic "imx8mp_fix" into integration
* changes:
plat: imx8mp: change the bl31 physical load address
plat: imx8m: Fix the macro define error
diff --git a/plat/imx/imx8m/imx8mp/include/platform_def.h b/plat/imx/imx8m/imx8mp/include/platform_def.h
index 644adc7..a5f265d 100644
--- a/plat/imx/imx8m/imx8mp/include/platform_def.h
+++ b/plat/imx/imx8m/imx8mp/include/platform_def.h
@@ -34,8 +34,8 @@
#define PLAT_WAIT_RET_STATE U(1)
#define PLAT_STOP_OFF_STATE U(3)
-#define BL31_BASE U(0x960000)
-#define BL31_LIMIT U(0x980000)
+#define BL31_BASE U(0x970000)
+#define BL31_LIMIT U(0x990000)
/* non-secure uboot base */
#define PLAT_NS_IMAGE_OFFSET U(0x40200000)
diff --git a/plat/imx/imx8m/include/gpc.h b/plat/imx/imx8m/include/gpc.h
index 075da91..29b8ecf 100644
--- a/plat/imx/imx8m/include/gpc.h
+++ b/plat/imx/imx8m/include/gpc.h
@@ -32,7 +32,7 @@
.pwr_req = name##_PWR_REQ, \
.pgc_offset = name##_PGC, \
.need_sync = false, \
- .always_on = true, \
+ .always_on = (on), \
}
#define IMX_MIX_DOMAIN(name, on) \
@@ -42,7 +42,7 @@
.adb400_sync = name##_ADB400_SYNC, \
.adb400_ack = name##_ADB400_ACK, \
.need_sync = true, \
- .always_on = true, \
+ .always_on = (on), \
}
struct imx_pwr_domain {