1 files changed, 6 insertions, 7 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
index 000eff41..94050a06 100644
--- 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
@@ -1,4 +1,4 @@
-From 8c433aa6c6b2eaed4084233beea99ee3fb0b652f Mon Sep 17 00:00:00 2001
+From 2338329e35254c1b8a887409d930ca76d9612093 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Wed, 4 Dec 2019 02:45:58 -0600
 Subject: [PATCH] imx: Fix multiple definition of ipc_handle
@@ -15,20 +15,19 @@ Change-Id: I6535954cc567d6efa06919069b91e3f50975b073
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h
-index 7cb109206..d2c3bba1c 100644
+index cc8e47b28..1e3e53247 100755
 --- a/plat/imx/common/include/sci/sci_ipc.h
 +++ b/plat/imx/common/include/sci/sci_ipc.h
-@@ -63,7 +63,7 @@ void sc_ipc_read(sc_ipc_t ipc, void *data);
+@@ -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 /* SC_IPC_H */
- 
+ #endif /* SCI_IPC_H */
 diff --git a/plat/imx/common/sci/ipc.c b/plat/imx/common/sci/ipc.c
-index 68b0b8ef0..3169b7e0b 100644
+index f329482fe..bf35a5ead 100755
 --- a/plat/imx/common/sci/ipc.c
 +++ b/plat/imx/common/sci/ipc.c
 @@ -11,6 +11,8 @@
@@ -37,7 +36,7 @@ index 68b0b8ef0..3169b7e0b 100644
  
 +sc_ipc_t ipc_handle;
 +
- #include <bakery_lock.h>
+ #include <lib/bakery_lock.h>
  DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock);
  #define sc_ipc_lock_init()     bakery_lock_init(&sc_ipc_bakery_lock)
 --