diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2020-01-24 13:15:35 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-24 13:15:35 +0000 |
| commit | 47eb228868ae13374059a758382620a6ef13b808 (patch) | |
| tree | 3b3e265e17940215da6e50ec1c34bde4b95e1de9 | |
| parent | 88ea77e07e702445a2bbbb3dfd159209389ac4c2 (diff) | |
| parent | 645ac02dd6f17fe7e59d5d858529e13be2c97df5 (diff) | |
| download | platform_external_arm-trusted-firmware-47eb228868ae13374059a758382620a6ef13b808.tar.gz platform_external_arm-trusted-firmware-47eb228868ae13374059a758382620a6ef13b808.tar.bz2 platform_external_arm-trusted-firmware-47eb228868ae13374059a758382620a6ef13b808.zip | |
Merge "qemu: Unify Platform specific defines for PSCI module" into integration
| -rw-r--r-- | plat/qemu/qemu/include/platform_def.h | 12 | ||||
| -rw-r--r-- | plat/qemu/qemu_sbsa/include/platform_def.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plat/qemu/qemu/include/platform_def.h b/plat/qemu/qemu/include/platform_def.h index c6b4db506..cce992ff9 100644 --- a/plat/qemu/qemu/include/platform_def.h +++ b/plat/qemu/qemu/include/platform_def.h @@ -18,20 +18,20 @@ #define PLATFORM_STACK_SIZE 0x1000 #if ARM_ARCH_MAJOR == 7 -#define PLATFORM_MAX_CPUS_PER_CLUSTER 4 -#define PLATFORM_CLUSTER_COUNT 1 +#define PLATFORM_MAX_CPUS_PER_CLUSTER U(4) +#define PLATFORM_CLUSTER_COUNT U(1) #define PLATFORM_CLUSTER0_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER -#define PLATFORM_CLUSTER1_CORE_COUNT 0 +#define PLATFORM_CLUSTER1_CORE_COUNT U(0) #else -#define PLATFORM_MAX_CPUS_PER_CLUSTER 4 -#define PLATFORM_CLUSTER_COUNT 2 +#define PLATFORM_MAX_CPUS_PER_CLUSTER U(4) +#define PLATFORM_CLUSTER_COUNT U(2) #define PLATFORM_CLUSTER0_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER #define PLATFORM_CLUSTER1_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER #endif #define PLATFORM_CORE_COUNT (PLATFORM_CLUSTER0_CORE_COUNT + \ PLATFORM_CLUSTER1_CORE_COUNT) -#define QEMU_PRIMARY_CPU 0 +#define QEMU_PRIMARY_CPU U(0) #define PLAT_NUM_PWR_DOMAINS (PLATFORM_CLUSTER_COUNT + \ PLATFORM_CORE_COUNT) diff --git a/plat/qemu/qemu_sbsa/include/platform_def.h b/plat/qemu/qemu_sbsa/include/platform_def.h index 333b21cc1..f44b9f6e0 100644 --- a/plat/qemu/qemu_sbsa/include/platform_def.h +++ b/plat/qemu/qemu_sbsa/include/platform_def.h @@ -15,14 +15,14 @@ #define PLATFORM_STACK_SIZE 0x1000 -#define PLATFORM_MAX_CPUS_PER_CLUSTER 4 -#define PLATFORM_CLUSTER_COUNT 2 +#define PLATFORM_MAX_CPUS_PER_CLUSTER U(4) +#define PLATFORM_CLUSTER_COUNT U(2) #define PLATFORM_CLUSTER0_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER #define PLATFORM_CLUSTER1_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER #define PLATFORM_CORE_COUNT (PLATFORM_CLUSTER0_CORE_COUNT + \ PLATFORM_CLUSTER1_CORE_COUNT) -#define QEMU_PRIMARY_CPU 0 +#define QEMU_PRIMARY_CPU U(0) #define PLAT_NUM_PWR_DOMAINS (PLATFORM_CLUSTER_COUNT + \ PLATFORM_CORE_COUNT) |