diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2019-08-02 10:21:53 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-08-02 10:21:53 +0000 |
| commit | a3b16996ecb5d1cedc997204612e5f7c36ccd576 (patch) | |
| tree | bf3de0c17a38822188847b7bdaad7f70441637b0 /drivers/arm/ccn/ccn.c | |
| parent | 01c44dddbda2bf74dff4bdbaee43177236982887 (diff) | |
| parent | 402b3cf8766fe2cb4ae462f7ee7761d08a1ba56c (diff) | |
Merge "Switch AARCH32/AARCH64 to __aarch64__" into integration
Diffstat (limited to 'drivers/arm/ccn/ccn.c')
| -rw-r--r-- | drivers/arm/ccn/ccn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/arm/ccn/ccn.c b/drivers/arm/ccn/ccn.c index d184054e..d0c5abc7 100644 --- a/drivers/arm/ccn/ccn.c +++ b/drivers/arm/ccn/ccn.c @@ -17,7 +17,7 @@ #include "ccn_private.h" static const ccn_desc_t *ccn_plat_desc; -#if defined(IMAGE_BL31) || (defined(AARCH32) && defined(IMAGE_BL32)) +#if defined(IMAGE_BL31) || (!defined(__aarch64__) && defined(IMAGE_BL32)) DEFINE_BAKERY_LOCK(ccn_lock); #endif @@ -264,7 +264,7 @@ static void ccn_snoop_dvm_do_op(unsigned long long rn_id_map, assert(ccn_plat_desc); assert(ccn_plat_desc->periphbase); -#if defined(IMAGE_BL31) || (defined(AARCH32) && defined(IMAGE_BL32)) +#if defined(IMAGE_BL31) || (!defined(__aarch64__) && defined(IMAGE_BL32)) bakery_lock_get(&ccn_lock); #endif start_region_id = region_id; @@ -284,7 +284,7 @@ static void ccn_snoop_dvm_do_op(unsigned long long rn_id_map, rn_id_map); } -#if defined(IMAGE_BL31) || (defined(AARCH32) && defined(IMAGE_BL32)) +#if defined(IMAGE_BL31) || (!defined(__aarch64__) && defined(IMAGE_BL32)) bakery_lock_release(&ccn_lock); #endif } |