1 files changed, 7 insertions, 65 deletions

diff --git a/recipes-ti/ipc/ti-ipc-rtos_git.bb b/recipes-ti/ipc/ti-ipc-rtos_git.bb
index 5b0bed59..693a4e9c 100644
--- a/recipes-ti/ipc/ti-ipc-rtos_git.bb
+++ b/recipes-ti/ipc/ti-ipc-rtos_git.bb
@@ -1,50 +1,8 @@
-require recipes-ti/includes/ti-paths.inc
-require recipes-ti/includes/ti-staging.inc
 require ti-ipc.inc
-
-TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/ipc/ipc-examples.git"
-TI_IPC_EXAMPLES_DEST_SUFFIX = "git/ipc-examples"
-TI_IPC_EXAMPLES_GIT_PROTOCOL = "git"
-TI_IPC_EXAMPLES_GIT_BRANCH = "master"
-TI_IPC_EXAMPLES_NAME = "ipc-examples"
-
-SRC_URI += "${TI_IPC_EXAMPLES_GIT_URI};\
-destsuffix=${TI_IPC_EXAMPLES_DEST_SUFFIX};\
-protocol=${TI_IPC_EXAMPLES_GIT_PROTOCOL};\
-branch=${TI_IPC_EXAMPLES_GIT_BRANCH};\
-name=${TI_IPC_EXAMPLES_NAME}"
-
-TI_IPC_METADATA_GIT_URI = "git://git.ti.com/ipc/ipc-metadata.git"
-TI_IPC_METADATA_DEST_SUFFIX = "git/ipc-metadata"
-TI_IPC_METADATA_GIT_PROTOCOL = "git"
-TI_IPC_METADATA_GIT_BRANCH = "master"
-TI_IPC_METADATA_NAME = "ipc-metadata"
-
-SRC_URI += "${TI_IPC_METADATA_GIT_URI};\
-destsuffix=${TI_IPC_METADATA_DEST_SUFFIX};\
-protocol=${TI_IPC_METADATA_GIT_PROTOCOL};\
-branch=${TI_IPC_METADATA_GIT_BRANCH};\
-name=${TI_IPC_METADATA_NAME}"
-
-# Corresponds to tag: 3.44.00.00
-SRCREV_ipc-examples = "a934d057647af00401e4bfd1c6a4a0f6144441b7"
-
-# Corresponds to tag: 3.44.00.00
-SRCREV_ipc-metadata = "07a745d47ecd7b4b64860e7c5d0fbe4e89524f2e"
-
-S_ipc-examples = "${WORKDIR}/git/ipc-examples"
-S_ipc-metadata = "${WORKDIR}/git/ipc-metadata"
-
-PR = "${INC_PR}.3"
+require ti-ipc-common.inc
+require ti-ipc-rtos.inc
 
 DEPENDS = "ti-xdctools ti-sysbios doxygen-native zip-native"
-DEPENDS_append_keystone = " ti-cgt6x-native \
-                            gcc-arm-none-eabi-native \
-"
-DEPENDS_append_omap-a15 = " ti-cgt6x-native \
-                            ti-ccsv6-native \
-                            gcc-arm-none-eabi-native \
-"
 
 PACKAGES =+ "${PN}-fw"
 FILES_${PN}-fw = "${base_libdir}/firmware/*"
@@ -55,27 +13,6 @@ INSANE_SKIP_${PN}-dev += "arch"
 
 ALLOW_EMPTY_${PN} = "1"
 
-IPC_TARGETS = ""
-IPC_TARGETS_omap-a15 = "\
-    gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
-    ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-    ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-    ti.targets.arm.elf.M4="${M4_TOOLCHAIN_INSTALL_DIR}" \
-"
-
-IPC_TARGETS_keystone = " \
-    gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
-    ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-    ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-"
-
-EXTRA_OEMAKE = "\
-    PLATFORM=${PLATFORM} \
-    XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \
-    BIOS_INSTALL_DIR="${SYSBIOS_INSTALL_DIR}" \
-    ${IPC_TARGETS} \
-"
-
 RELEASE_TYPE = "GA"
 RELEASE_SUFFIX = ""
 
@@ -93,6 +30,11 @@ do_compile() {
   cd ${S_ipc-examples}/src
   oe_runmake .examples \
     IPCTOOLS="${S_ipc-metadata}/src/etc"
+  if [ ! -z ${ALT_PLATFORM} ]; then
+    oe_runmake .examples \
+      IPCTOOLS="${S_ipc-metadata}/src/etc" \
+      PLATFORM=${ALT_PLATFORM}
+  fi
 
   if [  "${PLATFORM}" != "UNKNOWN" ]; then
     oe_runmake extract HOSTOS="bios" IPC_INSTALL_DIR="${S}"