diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-06-21 12:55:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-21 12:55:27 +0100 |
| commit | 01460492fc1c832e670ae63edf17e7b946999b8c (patch) | |
| tree | eb0463e2b7c4afc9dcfba5e09bca96312e12c1a0 /plat | |
| parent | 3caa841d9c756fe58e749dffecebdc328626b1c7 (diff) | |
| parent | 0435ba642de40d50f8d162a8942091d2ff938051 (diff) | |
| download | platform_external_arm-trusted-firmware-01460492fc1c832e670ae63edf17e7b946999b8c.tar.gz platform_external_arm-trusted-firmware-01460492fc1c832e670ae63edf17e7b946999b8c.tar.bz2 platform_external_arm-trusted-firmware-01460492fc1c832e670ae63edf17e7b946999b8c.zip | |
Merge pull request #1433 from sivadur/integration
xilinx: fix zynqmp build when tsp is enabled
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/xilinx/zynqmp/aarch64/zynqmp_common.c | 15 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/include/platform_def.h | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c index b144c84bd..c3612706a 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c @@ -205,12 +205,21 @@ static char *zynqmp_get_silicon_idcode_name(void) { uint32_t id, ver, chipid[2]; size_t i, j, len; - enum pm_ret_status ret; const char *name = "EG/EV"; - ret = pm_get_chipid(chipid); - if (ret) +#ifdef IMAGE_BL32 + /* + * For BL32, get the chip id info directly by reading corresponding + * registers instead of making pm call. This has limitation + * that these registers should be configured to have access + * from APU which is default case. + */ + chipid[0] = mmio_read_32(ZYNQMP_CSU_BASEADDR + ZYNQMP_CSU_IDCODE_OFFSET); + chipid[1] = mmio_read_32(EFUSE_BASEADDR + EFUSE_IPDISABLE_OFFSET); +#else + if (pm_get_chipid(chipid) != PM_RET_SUCCESS) return "UNKN"; +#endif id = chipid[0] & (ZYNQMP_CSU_IDCODE_DEVICE_CODE_MASK | ZYNQMP_CSU_IDCODE_SVD_MASK); diff --git a/plat/xilinx/zynqmp/include/platform_def.h b/plat/xilinx/zynqmp/include/platform_def.h index ebbc8c2cd..49766cc92 100644 --- a/plat/xilinx/zynqmp/include/platform_def.h +++ b/plat/xilinx/zynqmp/include/platform_def.h @@ -34,7 +34,7 @@ * little space for growth. */ #ifndef ZYNQMP_ATF_MEM_BASE -#if !DEBUG +#if !DEBUG && defined(SPD_none) # define BL31_BASE 0xfffea000 # define BL31_LIMIT 0xffffffff #else |