diff options
author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-01-24 17:03:17 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-24 17:03:17 +0000 |
commit | 9054018bd5c12b16ef55ea41fcf8cdb15a24ae18 (patch) | |
tree | 7e0962f5c2bc831ca8ec850eb291e933b389c534 /plat | |
parent | 262c5d30689403112568979dd6154849037fb122 (diff) | |
parent | 6cdef9ba1144776c14bebe2846391cec74594865 (diff) | |
download | arm-trusted-firmware-9054018bd5c12b16ef55ea41fcf8cdb15a24ae18.tar.gz |
Merge "xilinx: Unify Platform specific defines for PSCI module" into integration
Diffstat (limited to 'plat')
-rw-r--r-- | plat/xilinx/versal/include/platform_def.h | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/include/platform_def.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/xilinx/versal/include/platform_def.h b/plat/xilinx/versal/include/platform_def.h index 9f8392ce9..4cdaea219 100644 --- a/plat/xilinx/versal/include/platform_def.h +++ b/plat/xilinx/versal/include/platform_def.h @@ -17,7 +17,7 @@ /* Size of cacheable stacks */ #define PLATFORM_STACK_SIZE 0x440 -#define PLATFORM_CORE_COUNT 2 +#define PLATFORM_CORE_COUNT U(2) #define PLAT_MAX_PWR_LVL 1 #define PLAT_MAX_RET_STATE 1 #define PLAT_MAX_OFF_STATE 2 diff --git a/plat/xilinx/zynqmp/include/platform_def.h b/plat/xilinx/zynqmp/include/platform_def.h index 7b062fcaa..27968409e 100644 --- a/plat/xilinx/zynqmp/include/platform_def.h +++ b/plat/xilinx/zynqmp/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -21,8 +21,8 @@ /* Size of cacheable stacks */ #define PLATFORM_STACK_SIZE 0x440 -#define PLATFORM_CORE_COUNT 4 -#define PLAT_NUM_POWER_DOMAINS 5 +#define PLATFORM_CORE_COUNT U(4) +#define PLAT_NUM_POWER_DOMAINS U(5) #define PLAT_MAX_PWR_LVL U(1) #define PLAT_MAX_RET_STATE U(1) #define PLAT_MAX_OFF_STATE U(2) |