From 4a4cfdb3b2ed20cc1bc99221f64e6f2c1398177f Mon Sep 17 00:00:00 2001
From: Justin Sobota <jsobota@ti.com>
Date: Wed, 20 Apr 2016 02:49:44 +0000
Subject: [PATCH] traceframework: Clean up recipe

Signed-off-by: Justin Sobota <jsobota@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-bsp/traceframework/traceframework.inc | 28 +++++++++++++++
 .../traceframework/traceframework_git.bb      | 36 ++++---------------
 2 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100644 recipes-bsp/traceframework/traceframework.inc

diff --git a/recipes-bsp/traceframework/traceframework.inc b/recipes-bsp/traceframework/traceframework.inc
new file mode 100644
index 00000000..a9a1a968
--- /dev/null
+++ b/recipes-bsp/traceframework/traceframework.inc
@@ -0,0 +1,28 @@
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
+
+COMPATIBLE_MACHINE = "tci6614-evm|keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+TRACEFRAMEWORK_GIT_URI = "git://git.ti.com/keystone-rtos/traceframework.git"
+TRACEFRAMEWORK_GIT_PROTOCOL = "git"
+TRACEFRAMEWORK_GIT_BRANCH = "master"
+TRACEFRAMEWORK_GIT_DESTSUFFIX = "git/ti/instrumentation/traceframework"
+
+# Below commit ID corresponds to "DEV.TFWK-01.01.01.08B"
+TRACEFRAMEWORK_SRCREV = "e7a60a71a385337425547e3cac6716998c6a3528"
+
+BRANCH = "${TRACEFRAMEWORK_GIT_BRANCH}"
+SRC_URI = "${TRACEFRAMEWORK_GIT_URI};destsuffix=${TRACEFRAMEWORK_GIT_DESTSUFFIX};protocol=${TRACEFRAMEWORK_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${TRACEFRAMEWORK_SRCREV}"
+PV = "01.01.01.08"
+INC_PR = "r1"
+
+DEVICELIST = "k2k k2h k2e k2l"
+DEVICELIST_tci6614-evm = "c6614"
+DEVICELIST_k2hk-evm    = "k2k k2h"
+DEVICELIST_k2e-evm     = "k2e"
+DEVICELIST_k2l-evm     = "k2l"
+
+S = "${WORKDIR}/${TRACEFRAMEWORK_GIT_DESTSUFFIX}"
diff --git a/recipes-bsp/traceframework/traceframework_git.bb b/recipes-bsp/traceframework/traceframework_git.bb
index 49a7e959..a3b0d715 100644
--- a/recipes-bsp/traceframework/traceframework_git.bb
+++ b/recipes-bsp/traceframework/traceframework_git.bb
@@ -1,39 +1,12 @@
 DESCRIPTION = "TI Trace Framework library"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/instrumentation/traceframework/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
 
-TRACEFRAMEWORK_GIT_URI = "git://git.ti.com/keystone-rtos/traceframework.git"
-TRACEFRAMEWORK_GIT_PROTOCOL = "git"
-TRACEFRAMEWORK_GIT_BRANCH = "master"
-TRACEFRAMEWORK_GIT_DESTSUFFIX = "git/ti/instrumentation/traceframework"
-
-# Below commit ID corresponds to DEV.TFWK-01.01.01.08B
-TRACEFRAMEWORK_SRCREV = "e7a60a71a385337425547e3cac6716998c6a3528"
-
-BRANCH="${TRACEFRAMEWORK_GIT_BRANCH}"
-SRC_URI = "${TRACEFRAMEWORK_GIT_URI};destsuffix=${TRACEFRAMEWORK_GIT_DESTSUFFIX};protocol=${TRACEFRAMEWORK_GIT_PROTOCOL};branch=${BRANCH}"
-SRCREV = "${TRACEFRAMEWORK_SRCREV}"
-
-PV = "01.01.01.08"
-PR = "r1"
-
-COMPATIBLE_MACHINE = "(tci6614-evm|keystone)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "cuia"
 
-DEVICELIST = "k2k k2h k2e k2l"
-DEVICELIST_tci6614-evm = "c6614"
-DEVICELIST_k2hk-evm    = "k2k k2h"
-DEVICELIST_k2e-evm     = "k2e"
-DEVICELIST_k2l-evm     = "k2l"
+include traceframework.inc
 
-PACKAGES =+ "${PN}-test"
-
-FILES_${PN}-test = "${bindir}/tfw*.out \
-                    ${bindir}/*.txt"
+PR = "${INC_PR}.0"
 
 BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/instrumentation/traceframework"
 
 EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} \
                  CUIA_INSTALL_DIR=${STAGING_INCDIR} CUIA_LIB_DIR=${STAGING_LIBDIR}"
@@ -57,3 +30,8 @@ do_install() {
 		oe_runmake install DEVICE="$device" TFW_SRC_DIR=${S} TARGET_ROOT_DIR=${D}
 	done
 }
+
+PACKAGES =+ "${PN}-test"
+
+FILES_${PN}-test = "${bindir}/tfw*.out \
+                    ${bindir}/*.txt"