diff options
| author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2020-12-07 18:13:50 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-12-07 18:13:50 +0000 |
| commit | 0b18d5a5d64a9700eca6158876234b76cbae4ee5 (patch) | |
| tree | 996e5bc968c812e961b34d03642f66160051ae3d /plat | |
| parent | cd6eaab627d2e1cbfe5cbbc63806d696488c2ca8 (diff) | |
| parent | 490d81d2fa441de8b3b469b5e9c057b2ac68a5d6 (diff) | |
| download | platform_external_arm-trusted-firmware-0b18d5a5d64a9700eca6158876234b76cbae4ee5.tar.gz platform_external_arm-trusted-firmware-0b18d5a5d64a9700eca6158876234b76cbae4ee5.tar.bz2 platform_external_arm-trusted-firmware-0b18d5a5d64a9700eca6158876234b76cbae4ee5.zip | |
Merge changes from topic "zynqmp-misc-enhancement" into integration
* changes:
plat: xilinx: zynqmp: Enable log messages for debug
plat: zynqmp: Change macro name of PM_BOOT_HEALTH_STATUS_REG
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 9 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/include/zynqmp_def.h | 7 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index b6d8770cc..8272d6221 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -104,9 +104,12 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, else if (ret != FSBL_HANDOFF_SUCCESS) panic(); } - - NOTICE("BL31: Secure code at 0x%lx\n", bl32_image_ep_info.pc); - NOTICE("BL31: Non secure code at 0x%lx\n", bl33_image_ep_info.pc); + if (bl32_image_ep_info.pc) { + VERBOSE("BL31: Secure code at 0x%lx\n", bl32_image_ep_info.pc); + } + if (bl33_image_ep_info.pc) { + VERBOSE("BL31: Non secure code at 0x%lx\n", bl33_image_ep_info.pc); + } } /* Enable the test setup */ diff --git a/plat/xilinx/zynqmp/include/zynqmp_def.h b/plat/xilinx/zynqmp/include/zynqmp_def.h index 5e7254e5c..461439530 100644 --- a/plat/xilinx/zynqmp/include/zynqmp_def.h +++ b/plat/xilinx/zynqmp/include/zynqmp_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -341,8 +341,9 @@ #define PGGS_BASEADDR (0xFFD80050U) #define PGGS_NUM_REGS U(4) -/* Warm restart boot health status register and mask */ -#define PM_BOOT_HEALTH_STATUS_REG (GGS_BASEADDR + U(0x10)) +/* PMU GGS4 register 4 is used for warm restart boot health status */ +#define PMU_GLOBAL_GEN_STORAGE4 (GGS_BASEADDR + 0x10) +/* Warm restart boot health status mask */ #define PM_BOOT_HEALTH_STATUS_MASK U(0x01) /*AFI registers */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c index 60e80d907..9da904eb5 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -575,7 +575,7 @@ static enum pm_ret_status pm_ioctl_ulpi_reset(void) */ static enum pm_ret_status pm_ioctl_set_boot_health_status(unsigned int value) { - return pm_mmio_write(PM_BOOT_HEALTH_STATUS_REG, + return pm_mmio_write(PMU_GLOBAL_GEN_STORAGE4, PM_BOOT_HEALTH_STATUS_MASK, value); } |