diff options
author | Samuel Holland <samuel@sholland.org> | 2019-12-04 02:45:58 -0600 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-09-02 09:50:59 +0200 |
commit | 496568afd0b5ea05ec5f9420fcd29a6b98c4d058 (patch) | |
tree | 3d56af5370731e6eac2040239d945c64d0a11e00 | |
parent | ec40238f723c1092663dfc83a98d70272382f2f7 (diff) |
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
(cherry picked from commit 118a67a9a3a810d37bca89aab28922769ca04a84)
Conflicts:
plat/imx/common/include/sci/sci_ipc.h
plat/imx/common/sci/ipc.c
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rwxr-xr-x | plat/imx/common/include/sci/sci_ipc.h | 6 | ||||
-rwxr-xr-x | plat/imx/common/sci/ipc.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h index cc8e47b2..f336aae0 100755 --- a/plat/imx/common/include/sci/sci_ipc.h +++ b/plat/imx/common/include/sci/sci_ipc.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016 Freescale Semiconductor, Inc. - * Copyright 2017-2019 NXP + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. + * * SPDX-License-Identifier: BSD-3-Clause */ @@ -63,6 +63,6 @@ void sc_ipc_read(sc_ipc_t ipc, void *data); */ void sc_ipc_write(sc_ipc_t ipc, const 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 f329482f..bf0ed93e 100755 --- a/plat/imx/common/sci/ipc.c +++ b/plat/imx/common/sci/ipc.c @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 NXP + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,6 +12,9 @@ #include "imx8_mu.h" #include <lib/bakery_lock.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) |