diff options
| author | Samuel Holland <samuel@sholland.org> | 2019-12-04 02:45:58 -0600 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2019-12-04 02:59:03 -0600 |
| commit | 118a67a9a3a810d37bca89aab28922769ca04a84 (patch) | |
| tree | 6335b9388776ff2ca7c28959597e8c3aab822e66 /plat | |
| parent | e8bb1c2caa19fa224090eca0793586857199af9e (diff) | |
| download | platform_external_arm-trusted-firmware-118a67a9a3a810d37bca89aab28922769ca04a84.tar.gz platform_external_arm-trusted-firmware-118a67a9a3a810d37bca89aab28922769ca04a84.tar.bz2 platform_external_arm-trusted-firmware-118a67a9a3a810d37bca89aab28922769ca04a84.zip | |
imx: Fix multiple definition of ipc_handle
This is not conforming C and does not compile with -fno-common.
Signed-off-by: Samuel Holland <samuel@sholland.org>
Change-Id: I6535954cc567d6efa06919069b91e3f50975b073
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/imx/common/include/sci/sci_ipc.h | 4 | ||||
| -rw-r--r-- | plat/imx/common/sci/ipc.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h index 1167ea367..39e9012bc 100644 --- a/plat/imx/common/include/sci/sci_ipc.h +++ b/plat/imx/common/include/sci/sci_ipc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -62,6 +62,6 @@ void sc_ipc_read(sc_ipc_t ipc, void *data); */ void sc_ipc_write(sc_ipc_t ipc, void *data); -sc_ipc_t ipc_handle; +extern sc_ipc_t ipc_handle; #endif /* SCI_IPC_H */ diff --git a/plat/imx/common/sci/ipc.c b/plat/imx/common/sci/ipc.c index 6491ca575..576911925 100644 --- a/plat/imx/common/sci/ipc.c +++ b/plat/imx/common/sci/ipc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -13,6 +13,8 @@ #include <sci/sci_rpc.h> #include "imx8_mu.h" +sc_ipc_t ipc_handle; + DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock); #define sc_ipc_lock_init() bakery_lock_init(&sc_ipc_bakery_lock) #define sc_ipc_lock() bakery_lock_get(&sc_ipc_bakery_lock) |