[meta-freescale] [meta-freescale-layer][PATCH 5/5] ipc.inc: merge into ipc-ust and kernel-module-ipc

[ting.liu at nxp.com]

From: Ting Liu <ting.liu at nxp.com>

Make it possible to seperate ipc userspace and kernel codes in future.

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 recipes-extended/ipc-ust/ipc-ust_git.bb                       | 5 ++++-
 recipes-extended/ipc-ust/ipc.inc                              | 6 ------
 recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb  | 2 ++
 recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb | 2 ++
 recipes-kernel/kernel-modules/kernel-module-ipc.inc           | 5 +++--
 5 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 recipes-extended/ipc-ust/ipc.inc

diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb
index d8ade4e..c2f30e8 100644
--- a/recipes-extended/ipc-ust/ipc-ust_git.bb
+++ b/recipes-extended/ipc-ust/ipc-ust_git.bb
@@ -3,7 +3,8 @@ DESCRIPTION = "DSP boot application and ipc test application"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
 
-require ipc.inc
+SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v2.0.x"
+SRCREV = "74d662707558290f070f9589177db730444bc435"
 
 S = "${WORKDIR}/git"
 
@@ -43,3 +44,5 @@ FILES_${PN}-dbg += "/ipc/.debug"
 
 INSANE_SKIP_${PN} += "file-rdeps"
 INSANE_SKIP_${PN}-dev += "dev-elf"
+
+COMPATIBLE_MACHINE = "(b4860qds|b4420qds)"
diff --git a/recipes-extended/ipc-ust/ipc.inc b/recipes-extended/ipc-ust/ipc.inc
deleted file mode 100644
index 59d069b..0000000
--- a/recipes-extended/ipc-ust/ipc.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-DEPENDS = "virtual/kernel"
-
-SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v2.0.x"
-SRCREV = "74d662707558290f070f9589177db730444bc435"
-
-COMPATIBLE_MACHINE = "(b4860qds|b4420qds)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb b/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb
index d79659f..74e01bd 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb
@@ -9,3 +9,5 @@ do_install(){
 
 FILES_${PN} += "/usr/driver/IPC/multi_rat/*.ko"
 FILES_${PN}-dbg += "/usr/driver/IPC/multi_rat/.debug"
+
+COMPATIBLE_MACHINE = "(b4860qds|b4420qds)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb b/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb
index 917f66b..8615542 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb
@@ -9,3 +9,5 @@ do_install(){
 
 FILES_${PN} += "/usr/driver/IPC/single_rat/*.ko"
 FILES_${PN}-dbg += "/usr/driver/IPC/single_rat/.debug"
+
+COMPATIBLE_MACHINE = "(b4860qds|b4420qds)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
index fe303d6..e3c92f3 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
@@ -3,10 +3,11 @@ DESCRIPTION = "DSP boot application and ipc test application"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
 
-require recipes-extended/ipc-ust/ipc.inc
-
 inherit module qoriq_build_64bit_kernel
 
+SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v2.0.x"
+SRCREV = "74d662707558290f070f9589177db730444bc435"
+
 S = "${WORKDIR}/git"
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
-- 
1.9.2