Jacob Stiffler : common-csl-ip: Upgrade to version 3.3.0.1B

[git@arago-project.org (Arago Project git)]

Module: meta-ti
Branch: master
Commit: e887c3f2a6166adaf420eb2c5789e468de2633da
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=e887c3f2a6166adaf420eb2c5789e468de2633da

Author: Jacob Stiffler <j-stiffler@ti.com>
Date:   Wed Jan 27 03:16:42 2016 +0000

common-csl-ip: Upgrade to version 3.3.0.1B

* Re-implement common-csl-ip-rtos using the ti-pdk class

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

---

 .../common-csl-ip/common-csl-ip-rtos_git.bb        |   43 +++++++-------------
 recipes-bsp/common-csl-ip/common-csl-ip.inc        |   11 ++---
 recipes-bsp/common-csl-ip/common-csl-ip_git.bb     |    6 +++
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
index f8dc1ba..6f7d3cc 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -1,36 +1,23 @@
 require common-csl-ip.inc
-
 PR = "${INC_PR}.0"
 
-require recipes-ti/includes/ti-paths.inc
-require recipes-ti/includes/ti-staging.inc
-
-DEPENDS = "ti-xdctools ti-cgt6x-native ti-sysbios"
-
-CSL_GIT_DESTSUFFIX = "git/ti/csl"
+inherit ti-pdk
 
-export C6X_GEN_INSTALL_PATH="${STAGING_DIR_NATIVE}/usr"
-export XDCCGROOT="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export XDCPATH="${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages"
+DEPENDS_remove = "${PN}"
 
-do_configure() {
-    sed -i "s/\ \"\.\\\\\\\\\"\ +//" src/Module.xs
-    find -name "*.xs" -exec sed -i "s/ofd6x\.exe/ofd6x/" {} \;
-    find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \;
-    find -name "*.xs" -exec sed -i "/\.chm/d" {} \;
-    find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \;
-}
+XDCARGS_ti33x = "am335x"
+XDCARGS_ti43x = "am437x"
+XDCARGS_omap-a15 = "am571x am572x"
+XDCARGS_k2hk-evm = "k2h k2k"
+XDCARGS_k2l-evm = "k2l"
+XDCARGS_k2e-evm = "k2e"
 
-do_compile() {
-    ${XDC_INSTALL_DIR}/xdc .make
-    ${XDC_INSTALL_DIR}/xdc clean
-    ${XDC_INSTALL_DIR}/xdc release
-}
+do_configure_append() {
+    # Create empty makefile
+    # If libraries are supported for this device, then this will be overwritten
+    cat > ${BUILD_DIR}/makefile << __EOF__
+# Nothing to do
+all:
 
-do_install () {
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages
-    find -name "*.tar" -exec tar xf {} -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages \;
+__EOF__
 }
-
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN}-dev += "${PDK_INSTALL_DIR_RECIPE}/packages"
diff --git a/recipes-bsp/common-csl-ip/common-csl-ip.inc b/recipes-bsp/common-csl-ip/common-csl-ip.inc
index 74abab0..c81b0f1 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip.inc
+++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc
@@ -5,19 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
 COMPATIBLE_MACHINE = "keystone|dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-INC_PR = "r4"
+PV = "3.3.0.1B"
+INC_PR = "r0"
 
 CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
 CSL_GIT_PROTOCOL ="git"
 CSL_GIT_BRANCH = "master"
-CSL_GIT_BRANCH_dra7xx = "releases/PROCESSOR-SDK.01.00.00"
 CSL_GIT_DESTSUFFIX = "git"
 
-# commit ID corresponds to DEV.CSL_KEYSTONE2.02.01.01.00A
-CSL_SRCREV = "17bb083f0d5ed4ad6f38c991210a6a8e9aaf9c56"
-
-# commit ID corresponds to PROCESSOR-SDK-ALPHA-1
-CSL_SRCREV_dra7xx = "37c5311ddf289f83b1432a9422816722d264bf55"
+# commit ID corresponds to DEV.CSL_PROCESSOR-SDK.03.03.00.01B
+CSL_SRCREV = "48bb80a8d5919e17528a21be5d3ea6437dfc0425"
 
 BRANCH="${CSL_GIT_BRANCH}"
 SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"
diff --git a/recipes-bsp/common-csl-ip/common-csl-ip_git.bb b/recipes-bsp/common-csl-ip/common-csl-ip_git.bb
index 77f7858..9ea87d3 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip_git.bb
@@ -4,6 +4,12 @@ PR = "${INC_PR}.0"
 
 ALLOW_EMPTY_${PN} = "1"
 
+CLEANBROKEN = "1"
+
+do_compile() {
+    :
+}
+
 do_install () {
     install -d ${D}${includedir}/ti/csl
     find . -name "*.h" -type f | xargs -I {} cp --parents {} ${D}${includedir}/ti/csl