diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2020-01-24 13:14:57 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-24 13:14:57 +0000 |
| commit | 076d89753f849ad44fe88913a4bd3b8cf8b6ffbd (patch) | |
| tree | a1298ce59465b6ac4caed9aaa4cc69f39318dbca | |
| parent | 713403cb4d36a68afdb37eb87623555bb41ed33c (diff) | |
| parent | ac2f6d4353a7b817df97c7f120d13bd6157f7931 (diff) | |
| download | platform_external_arm-trusted-firmware-076d89753f849ad44fe88913a4bd3b8cf8b6ffbd.tar.gz platform_external_arm-trusted-firmware-076d89753f849ad44fe88913a4bd3b8cf8b6ffbd.tar.bz2 platform_external_arm-trusted-firmware-076d89753f849ad44fe88913a4bd3b8cf8b6ffbd.zip | |
Merge "marvell: Unify Platform specific defines for PSCI module" into integration
| -rw-r--r-- | plat/marvell/a3700/common/include/platform_def.h | 4 | ||||
| -rw-r--r-- | plat/marvell/a8k/common/include/platform_def.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/marvell/a3700/common/include/platform_def.h b/plat/marvell/a3700/common/include/platform_def.h index 591f04585..e6660d407 100644 --- a/plat/marvell/a3700/common/include/platform_def.h +++ b/plat/marvell/a3700/common/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Marvell International Ltd. + * Copyright (C) 2016-2019 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses @@ -78,7 +78,7 @@ (PLAT_MARVELL_ATF_LOAD_ADDR + 0x20000) #define PLAT_MARVELL_FIP_MAX_SIZE 0x4000000 -#define PLAT_MARVELL_CLUSTER_CORE_COUNT 2 +#define PLAT_MARVELL_CLUSTER_CORE_COUNT U(2) /* DRAM[2MB..66MB] is used as Trusted ROM */ #define PLAT_MARVELL_TRUSTED_ROM_BASE PLAT_MARVELL_ATF_LOAD_ADDR /* 64 MB TODO: reduce this to minimum needed according to fip image size*/ diff --git a/plat/marvell/a8k/common/include/platform_def.h b/plat/marvell/a8k/common/include/platform_def.h index b9c2e0ed7..ec1c9036c 100644 --- a/plat/marvell/a8k/common/include/platform_def.h +++ b/plat/marvell/a8k/common/include/platform_def.h @@ -86,8 +86,8 @@ #define PLAT_MARVELL_NORTHB_COUNT 1 -#define PLAT_MARVELL_CLUSTER_COUNT 2 -#define PLAT_MARVELL_CLUSTER_CORE_COUNT 2 +#define PLAT_MARVELL_CLUSTER_COUNT U(2) +#define PLAT_MARVELL_CLUSTER_CORE_COUNT U(2) #define PLAT_MARVELL_CORE_COUNT (PLAT_MARVELL_CLUSTER_COUNT * \ PLAT_MARVELL_CLUSTER_CORE_COUNT) |