mirrors/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-08-16 01:17:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1071 from jeenu-arm/syntax-fix

Browse Source 
plat/arm: Fix ARM_INSTANTIATE_LOCK syntax anomaly
This commit is contained in:
danh-arm 2017-08-29 15:25:36 +01:00 committed by GitHub
commit 77544efbf4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/plat/arm/common/plat_arm.h
View File

@ -45,7 +45,7 @@ void arm_setup_page_tables(uintptr_t total_base,
* Use this macro to instantiate lock before it is used in below * Use this macro to instantiate lock before it is used in below
* arm_lock_xxx() macros * arm_lock_xxx() macros
*/ */
#define ARM_INSTANTIATE_LOCK DEFINE_BAKERY_LOCK(arm_lock); #define ARM_INSTANTIATE_LOCK DEFINE_BAKERY_LOCK(arm_lock)
#define ARM_LOCK_GET_INSTANCE (&arm_lock) #define ARM_LOCK_GET_INSTANCE (&arm_lock)
/* /*
* These are wrapper macros to the Coherent Memory Bakery Lock API. * These are wrapper macros to the Coherent Memory Bakery Lock API.
@ -59,7 +59,7 @@ void arm_setup_page_tables(uintptr_t total_base,
/* /*
* Empty macros for all other BL stages other than BL31 and BL32 * Empty macros for all other BL stages other than BL31 and BL32
*/ */
#define ARM_INSTANTIATE_LOCK #define ARM_INSTANTIATE_LOCK static int arm_lock __unused
#define ARM_LOCK_GET_INSTANCE 0 #define ARM_LOCK_GET_INSTANCE 0
#define arm_lock_init() #define arm_lock_init()
#define arm_lock_get() #define arm_lock_get()

4
plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -15,7 +15,7 @@
* TODO: Someday there will be a generic power controller api. At the moment * TODO: Someday there will be a generic power controller api. At the moment
* each platform has its own pwrc so just exporting functions is fine. * each platform has its own pwrc so just exporting functions is fine.
*/ */
ARM_INSTANTIATE_LOCK ARM_INSTANTIATE_LOCK;
unsigned int fvp_pwrc_get_cpu_wkr(u_register_t mpidr) unsigned int fvp_pwrc_get_cpu_wkr(u_register_t mpidr)
{ {

2
plat/arm/css/drivers/scp/css_pm_scmi.c
View File

@ -76,7 +76,7 @@ void *scmi_handle;
/* The SCMI channel global object */ /* The SCMI channel global object */
static scmi_channel_t scmi_channel; static scmi_channel_t scmi_channel;
ARM_INSTANTIATE_LOCK ARM_INSTANTIATE_LOCK;
/* /*
* Helper function to suspend a CPU power domain and its parent power domains * Helper function to suspend a CPU power domain and its parent power domains

4
plat/arm/css/drivers/scpi/css_mhu.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -23,7 +23,7 @@
#define CPU_INTR_S_SET 0x308 #define CPU_INTR_S_SET 0x308
#define CPU_INTR_S_CLEAR 0x310 #define CPU_INTR_S_CLEAR 0x310
ARM_INSTANTIATE_LOCK ARM_INSTANTIATE_LOCK;
/* Weak definition may be overridden in specific CSS based platform */ /* Weak definition may be overridden in specific CSS based platform */
#pragma weak plat_arm_pwrc_setup #pragma weak plat_arm_pwrc_setup