diff options
Diffstat (limited to 'recipes-bsp/imx-atf/imx-atf')
-rw-r--r-- | recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-multiple-definition-of-ipc_handle.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-multiple-definition-of-ipc_handle.patch b/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-multiple-definition-of-ipc_handle.patch new file mode 100644 index 00000000..000eff41 --- /dev/null +++ b/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-multiple-definition-of-ipc_handle.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 8c433aa6c6b2eaed4084233beea99ee3fb0b652f Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuel Holland <samuel@sholland.org> | ||
3 | Date: Wed, 4 Dec 2019 02:45:58 -0600 | ||
4 | Subject: [PATCH] imx: Fix multiple definition of ipc_handle | ||
5 | |||
6 | This is not conforming C and does not compile with -fno-common. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: Samuel Holland <samuel@sholland.org> | ||
11 | Change-Id: I6535954cc567d6efa06919069b91e3f50975b073 | ||
12 | --- | ||
13 | plat/imx/common/include/sci/sci_ipc.h | 2 +- | ||
14 | plat/imx/common/sci/ipc.c | 2 ++ | ||
15 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h | ||
18 | index 7cb109206..d2c3bba1c 100644 | ||
19 | --- a/plat/imx/common/include/sci/sci_ipc.h | ||
20 | +++ b/plat/imx/common/include/sci/sci_ipc.h | ||
21 | @@ -63,7 +63,7 @@ void sc_ipc_read(sc_ipc_t ipc, void *data); | ||
22 | */ | ||
23 | void sc_ipc_write(sc_ipc_t ipc, const void *data); | ||
24 | |||
25 | -sc_ipc_t ipc_handle; | ||
26 | +extern sc_ipc_t ipc_handle; | ||
27 | |||
28 | #endif /* SC_IPC_H */ | ||
29 | |||
30 | diff --git a/plat/imx/common/sci/ipc.c b/plat/imx/common/sci/ipc.c | ||
31 | index 68b0b8ef0..3169b7e0b 100644 | ||
32 | --- a/plat/imx/common/sci/ipc.c | ||
33 | +++ b/plat/imx/common/sci/ipc.c | ||
34 | @@ -11,6 +11,8 @@ | ||
35 | |||
36 | #include "imx8_mu.h" | ||
37 | |||
38 | +sc_ipc_t ipc_handle; | ||
39 | + | ||
40 | #include <bakery_lock.h> | ||
41 | DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock); | ||
42 | #define sc_ipc_lock_init() bakery_lock_init(&sc_ipc_bakery_lock) | ||
43 | -- | ||
44 | 2.28.0 | ||
45 | |||