merge of '175617edcda6a7db0736cb199971e613308f4f28'

     and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'

7 files changed, 54 insertions, 23 deletions

diff --git a/packages/dsplink/davinci-dvevm/.mtn2git_empty b/packages/batmand/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dsplink/davinci-dvevm/.mtn2git_empty
+++ b/packages/batmand/.mtn2git_empty
diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
index 9d0e1134d8..7051966ffc 100644
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "DSP Link for TI ARM/DSP processors"
 
-DEPENDS = "virtual/kernel"
+DEPENDS = "virtual/kernel perl-native"
+
+inherit module-base
 
 PR = "r0"
 
@@ -8,10 +10,11 @@ PR = "r0"
 # md5sum
 # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
 
-SRC_URI ="http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
-file://CURRENTCFG.MK \
-file://c64xx_5.xx_linux.mk \
-file://davinci_mvlpro5.0.mk \
+SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
+           file://CURRENTCFG.MK \
+           file://c64xx_5.xx_linux.mk \
+           file://davinci_mvlpro5.0.mk \
+	   file://prcs-fix-include.patch;patch=1 \
 "
 
 S = "${WORKDIR}/dsplink_1_50/dsplink"
@@ -23,10 +26,28 @@ do_configure () {
 	cp ${WORKDIR}/CURRENTCFG.MK ${S}/config
 	cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/make/Linux
 	cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/make/DspBios
+
+	sed -i 	-e s:SED_ME_SOURCEDIR:${S}:g \
+		-e s:SED_ME_GPPDISTRO:davinci_mvlpro5\.0:g \
+		-e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \
+		-e s:SED_ME_DSPDISTRO:davinci_mvlpro5\.0:g \
+		-e s:SED_ME_PLATFORM:Davinci:g \
+		${S}/config/CURRENTCFG.MK	
+
+	sed -i	-e s:SED_ME_CROSS:${STAGING_INCDIR}:g \
+		-e s:SED_ME_STAGINGDIR:${STAGING_DIR_TARGET}:g \
+		-e s:SED_ME_TARGET_PREFIX:${TARGET_PREFIX}:g \
+		-e s:SED_ME_KERNELDIR:${STAGING_KERNEL_DIR}:g \	
+		${S}/make/Linux/davinci_mvlpro5.0.mk 
+
 }
 
+PARALLEL_MAKE = ""
+
 do_compile () {
-	make -C ${S}/dsplink/gpp/src
+	ln -sf ${S}/gpp/src/api/*h ${S}/gpp/inc/
+	ln -sf ${S}/gpp/src/pmgr/Linux/2.6.18 ${S}/gpp/src/pmgr/Linux/2.6.26-rc2-omap1
+	oe_runmake -C ${S}/gpp/src
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}" 
diff --git a/packages/dsplink/files/.mtn2git_empty b/packages/dsplink/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dsplink/files/.mtn2git_empty
diff --git a/packages/dsplink/davinci-dvevm/CURRENTCFG.MK b/packages/dsplink/files/CURRENTCFG.MK
index 8cc676e4ed..ff109de482 100644
--- a/packages/dsplink/davinci-dvevm/CURRENTCFG.MK
+++ b/packages/dsplink/files/CURRENTCFG.MK
@@ -17,8 +17,8 @@ export  CFGDATE            := MAY 14, 2008  11:53:09
 #   =========================================================
 #   DSP/BIOS LINK GPP side root directory.
 #   =========================================================
-export GPPROOT             := /home/balister/src/dsplink_1_50/dsplink/gpp
-export DSPROOT             := /home/balister/src/dsplink_1_50/dsplink/dsp
+export GPPROOT             := SED_ME_SOURCEDIR/gpp
+export DSPROOT             := SED_ME_SOURCEDIR/dsp
 
 
 #   =========================================================
@@ -31,17 +31,17 @@ export DSPOS               := DspBios
 #   =========================================================
 #   Specific distribution of GPP and DSP OS (if any)
 #   =========================================================
-export GPPDISTRIBUTION     := davinci_mvlpro5.0
-export GPPOSVERSION        := 2.6.18
+export GPPDISTRIBUTION     := SED_ME_GPPDISTRO
+export GPPOSVERSION        := SED_ME_KERNELVERSION
 export GPPOSVARIANT        := 
-export DSPDISTRIBUTION     := c64xxp_5.xx_linux
+export DSPDISTRIBUTION     := SED_ME_DSPDISTRO
 
 
 #   =========================================================
 #   Target GPP and DSP platforms for DSP/BIOS LINK
 #   =========================================================
-export GPPPLATFORM         := Davinci
-export DSPPLATFORM         := Davinci
+export GPPPLATFORM         := SED_ME_PLATFORM
+export DSPPLATFORM         := SED_ME_PLATFORM
 
 
 #   =========================================================
diff --git a/packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk b/packages/dsplink/files/c64xx_5.xx_linux.mk
index d0b27d7a55..d0b27d7a55 100644
--- a/packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk
+++ b/packages/dsplink/files/c64xx_5.xx_linux.mk
diff --git a/packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk b/packages/dsplink/files/davinci_mvlpro5.0.mk
index d29adc0582..2ea2fd8915 100644
--- a/packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk
+++ b/packages/dsplink/files/davinci_mvlpro5.0.mk
@@ -35,7 +35,7 @@ USE_DISTRIBUTION := 1
 #   ----------------------------------------------------------------------------
 #   Base directory for the GPP OS
 #   ----------------------------------------------------------------------------
-BASE_BUILDOS    := ${HOME}/montavista/kernel/Linux
+BASE_BUILDOS    := SED_ME_KERNELDIR
 
 #   ----------------------------------------------------------------------------
 #   Base for code generation tools - compiler, linker, archiver etc.
@@ -48,8 +48,8 @@ BASE_CGTOOLS    := /opt/montavista/pro/devkit/arm/v5t_le/bin
 BASE_OSINC      := $(BASE_BUILDOS)/include
 
 OSINC_GENERIC   := $(BASE_OSINC)
-OSINC_PLATFORM  := /opt/montavista/pro/devkit/arm/v5t_le/lib/gcc/armv5tl-montavista-linux-gnueabi/4.2.0/include
-OSINC_TARGET    := /opt/montavista/pro/devkit/arm/v5t_le/target/usr/include
+OSINC_PLATFORM  := SED_ME_CROSS/4.2.0/include
+OSINC_TARGET    := SED_ME_STAGINGDIR/usr/include
 
 ifneq ("$(VARIANT)", "")
 OSINC_VARIANT   := $(BASE_OSINC)
@@ -59,7 +59,7 @@ endif
 #   ----------------------------------------------------------------------------
 #   Base directory for libraries provided by GPP OS
 #   ----------------------------------------------------------------------------
-BASE_OSLIB      := /opt/montavista/pro/devkit/arm/v5t_le/lib
+BASE_OSLIB      := SED_ME_STAGINGDIR/lib
 
 OSLIB_GENERIC   := $(BASE_OSLIB)
 OSLIB_PLATFORM  := $(BASE_OSLIB)
@@ -77,10 +77,10 @@ endif
 #   ----------------------------------------------------------------------------
 #   Name of the compiler
 #   ----------------------------------------------------------------------------
-COMPILER        := $(BASE_CGTOOLS)/arm_v5t_le-gcc
-LD              := $(BASE_CGTOOLS)/arm_v5t_le-ld
+COMPILER        := SED_ME_TARGET_PREFIXgcc
+LD              := SED_ME_TARGET_PREFIXDIR-ld
 
-CROSS_COMPILE   := arm_v5t_le-
+CROSS_COMPILE   := SED_ME_TARGET_PREFIX
 export CROSS_COMPILE
 
 #   ----------------------------------------------------------------------------
@@ -135,7 +135,7 @@ STD_CC_DEFNS    := -D_REENTRANT
 #   ============================================================================
 #   ARCHIVER1 - This denotes the linker.
 #   ============================================================================
-ARCHIVER1        := $(BASE_CGTOOLS)/arm_v5t_le-ld
+ARCHIVER1        := SED_ME_TARGET_PREFIX-ld
 
 #   ----------------------------------------------------------------------------
 #   Standard flags for the archiver
@@ -146,7 +146,7 @@ STD_AR_FLAGS1    := -EL -r
 #   ============================================================================
 #   ARCHIVER2 - This denotes the archiver.
 #   ============================================================================
-ARCHIVER2        := $(BASE_CGTOOLS)/arm_v5t_le-ar
+ARCHIVER2        := SED_ME_TARGET_PREFIX-ar
 
 #   ----------------------------------------------------------------------------
 #   Standard flags for the archiver
@@ -157,7 +157,7 @@ STD_AR_FLAGS2    := -r
 #   ============================================================================
 #   LINKER - The compiler is used for linking purpose as well.
 #   ============================================================================
-LINKER      := $(BASE_CGTOOLS)/arm_v5t_le-gcc
+LINKER      := SED_ME_TARGET_PREFIXgcc
 
 #   ----------------------------------------------------------------------------
 #   Command line switches used by the linker
diff --git a/packages/dsplink/files/prcs-fix-include.patch b/packages/dsplink/files/prcs-fix-include.patch
new file mode 100644
index 0000000000..12fcd5ec5d
--- /dev/null
+++ b/packages/dsplink/files/prcs-fix-include.patch
@@ -0,0 +1,10 @@
+--- /tmp/prcs.c	2008-05-15 20:35:49.946802023 +0200
++++ dsplink_1_50/dsplink/gpp/src/osal/Linux/prcs.c	2008-05-15 20:36:01.386858569 +0200
+@@ -17,6 +17,7 @@
+ 
+ /*  ----------------------------------- OS Specific Headers         */
+ #include <linux/autoconf.h>
++#include <linux/sched.h>
+ #include <linux/spinlock.h>
+ #include <linux/module.h>
+ #include <linux/mm.h>