diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-03-18 12:16:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-18 12:16:27 +0000 |
| commit | 3944adca5943a050ca7e7e9cc802a9ae04dec186 (patch) | |
| tree | 5cf7136c202a31ff67477bc76d7f3ffa4ec66ced /drivers/arm | |
| parent | effe0dcab170a524dffde76dd88c582814c6b8a9 (diff) | |
| parent | a6b3954b2ffd695972ec099089cb2dde92ebaaa3 (diff) | |
Merge pull request #861 from soby-mathew/sm/aarch32_fixes
Misc AArch32 fixes
Diffstat (limited to 'drivers/arm')
| -rw-r--r-- | drivers/arm/ccn/ccn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/arm/ccn/ccn.c b/drivers/arm/ccn/ccn.c index d739c6bf..ca061827 100644 --- a/drivers/arm/ccn/ccn.c +++ b/drivers/arm/ccn/ccn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -38,7 +38,7 @@ #include "ccn_private.h" static const ccn_desc_t *ccn_plat_desc; -#ifdef IMAGE_BL31 +#if defined(IMAGE_BL31) || (defined(AARCH32) && defined(IMAGE_BL32)) DEFINE_BAKERY_LOCK(ccn_lock); #endif @@ -285,7 +285,7 @@ static void ccn_snoop_dvm_do_op(unsigned long long rn_id_map, assert(ccn_plat_desc); assert(ccn_plat_desc->periphbase); -#ifdef IMAGE_BL31 +#if defined(IMAGE_BL31) || (defined(AARCH32) && defined(IMAGE_BL32)) bakery_lock_get(&ccn_lock); #endif start_region_id = region_id; @@ -305,7 +305,7 @@ static void ccn_snoop_dvm_do_op(unsigned long long rn_id_map, rn_id_map); } -#ifdef IMAGE_BL31 +#if defined(IMAGE_BL31) || (defined(AARCH32) && defined(IMAGE_BL32)) bakery_lock_release(&ccn_lock); #endif } |