dsplink: start adding tweaks to build against a post-header move kernel as well

diff --git a/packages/dsplink/dsplink-module_1.60.bb b/packages/dsplink/dsplink-module_1.60.bb
index 4b9051a6933cbd4586c409ff8d139e11ba0b47cc..3cfdf308bdd6b7811f0dd2ee19b3276eb83f93cb 100644 (file)
--- a/packages/dsplink/dsplink-module_1.60.bb
+++ b/packages/dsplink/dsplink-module_1.60.bb
@@ -26,6 +26,11 @@ do_configure() {
     
        mkdir -p ${S}/dsplink-kbuild-test
     cp ${WORKDIR}/Makefile-dsplink-kbuild  ${S}/dsplink-kbuild-test/Makefile
+
+    if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 26 ] ; then
+        sed -i -e s:asm/semaphore:linux/semaphore: ${S}/gpp/src/osal/Linux/user.c
+        sed -i -e s:asm/semaphore:linux/semaphore: ${S}/gpp/src/osal/Linux/2.6.18/sync.c
+    fi
 }
 
 do_compile_prepend() {

diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 506b34b21a4257c8e9f3cbbff400d979114d4225..bae948c2fd7b0cf0719818b4024f50a2217206aa 100644 (file)
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -19,6 +19,11 @@ do_configure () {
        cd ${DSPLINK}
        perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX  --gppos=${GPPOS} --comps=ponslrm
        )
+
+       if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 26 ] ; then
+               sed -i -e s:asm/semaphore:linux/semaphore: ${S}/gpp/src/osal/Linux/user.c
+               sed -i -e s:asm/semaphore:linux/semaphore: ${S}/gpp/src/osal/Linux/2.6.18/sync.c
+       fi
 }
 
 PARALLEL_MAKE = ""

diff --git a/packages/dsplink/lpm.inc b/packages/dsplink/lpm.inc
index 7938268c520a1d42f9d01c2bda05c4b1fb458ab9..ed8d8684624d1388a7dc4bc5418e44c288312861 100644 (file)
--- a/packages/dsplink/lpm.inc
+++ b/packages/dsplink/lpm.inc
@@ -32,6 +32,7 @@ do_compile_append() {
 do_install() {
                install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
                cp ${S}/cetools/packages/ti/bios/power/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true
+        cp ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true
 }
 
 INHIBIT_PACKAGE_STRIP = "1"