diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2021-04-30 13:01:48 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-04-30 13:01:48 +0200 |
| commit | 711505f045cb02092ffb756000871a185e9b7b0b (patch) | |
| tree | c896d728e149e8e12902dbc6cc11d96a77f4642e | |
| parent | dd6efc9ea52e9dbfaeacbb439abbc0f8ecddd89c (diff) | |
| parent | 7f9390d3a3ffc76ea23853920ae31ecdcd68d1d4 (diff) | |
| download | arm-trusted-firmware-711505f045cb02092ffb756000871a185e9b7b0b.tar.gz | |
Merge changes from topic "imx8mp_fix" into integration
* changes:
plat: imx8mp: change the bl31 physical load address
plat: imx8m: Fix the macro define error
| -rw-r--r-- | plat/imx/imx8m/imx8mp/include/platform_def.h | 4 | ||||
| -rw-r--r-- | plat/imx/imx8m/include/gpc.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/imx/imx8m/imx8mp/include/platform_def.h b/plat/imx/imx8m/imx8mp/include/platform_def.h index 644adc771..a5f265d0d 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 075da91b1..29b8ecf93 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 { |