diff options
| author | Samuel Holland <samuel@sholland.org> | 2019-12-04 02:45:58 -0600 |
|---|---|---|
| committer | Tom Hochstein <tom.hochstein@nxp.com> | 2020-08-31 16:56:14 -0500 |
| commit | 3f3abbf9dff9152bede95c02c945aa84c53f4bd3 (patch) | |
| tree | b537f324fbab6ed24ba6b527bca4f8caa2be0296 | |
| parent | af31d150b46c4d341c7e2c851318db225cc6c10b (diff) | |
imx: Fix multiple definition of ipc_handle
This is not conforming C and does not compile with -fno-common.
Upstream-Status: Backport
Signed-off-by: Samuel Holland <samuel@sholland.org>
Change-Id: I6535954cc567d6efa06919069b91e3f50975b073
| -rwxr-xr-x | plat/imx/common/include/sci/sci_ipc.h | 2 | ||||
| -rwxr-xr-x | plat/imx/common/sci/ipc.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h index cc8e47b2..1e3e5324 100755 --- a/plat/imx/common/include/sci/sci_ipc.h +++ b/plat/imx/common/include/sci/sci_ipc.h @@ -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..bf35a5ea 100755 --- a/plat/imx/common/sci/ipc.c +++ b/plat/imx/common/sci/ipc.c @@ -11,6 +11,8 @@ #include "imx8_mu.h" +sc_ipc_t ipc_handle; + #include <lib/bakery_lock.h> DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock); #define sc_ipc_lock_init() bakery_lock_init(&sc_ipc_bakery_lock) |