merge of '3b5a264cff607e4c4977e318dde1e861a664ad81'

     and '92366ccb09c8d809619c585c91fe69a2046e1396'

5 files changed, 532 insertions, 2 deletions

diff --git a/packages/dsplink/davinci-dvevm/.mtn2git_empty b/packages/dsplink/davinci-dvevm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dsplink/davinci-dvevm/.mtn2git_empty
diff --git a/packages/dsplink/davinci-dvevm/CURRENTCFG.MK b/packages/dsplink/davinci-dvevm/CURRENTCFG.MK
new file mode 100644
index 0000000000..8cc676e4ed
--- /dev/null
+++ b/packages/dsplink/davinci-dvevm/CURRENTCFG.MK
@@ -0,0 +1,99 @@
+#   =========================================================
+#   DSP/BIOS LINK Configuration file.
+#
+#   CAUTION! This is a generated file.
+#            All changes will be lost.
+#
+#   This file was generated on MAY 14, 2008  11:53:09
+#   =========================================================
+
+
+#   =========================================================
+#   When this file was created.
+#   =========================================================
+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
+
+
+#   =========================================================
+#   GPP and DSP OS for which DSP/BIOS LINK is being built
+#   =========================================================
+export GPPOS               := Linux
+export DSPOS               := DspBios
+
+
+#   =========================================================
+#   Specific distribution of GPP and DSP OS (if any)
+#   =========================================================
+export GPPDISTRIBUTION     := davinci_mvlpro5.0
+export GPPOSVERSION        := 2.6.18
+export GPPOSVARIANT        := 
+export DSPDISTRIBUTION     := c64xxp_5.xx_linux
+
+
+#   =========================================================
+#   Target GPP and DSP platforms for DSP/BIOS LINK
+#   =========================================================
+export GPPPLATFORM         := Davinci
+export DSPPLATFORM         := Davinci
+
+
+#   =========================================================
+#   Target GPP and DSP devices
+#   =========================================================
+export GPPDEVICE           := Davinci
+export DSPDEVICE           := C64XX
+
+
+#   =========================================================
+#   Compile time scalability options for DSP/BIOS LINK
+#   =========================================================
+export USE_PROC            := 1
+export USE_POOL            := 1
+export USE_NOTIFY          := 1
+export USE_MPCS            := 1
+export USE_RINGIO          := 1
+export USE_MPLIST          := 0
+export USE_MSGQ            := 0
+export USE_CHNL            := 0
+
+
+#   =========================================================
+#   Compile time physical link scalability options for device
+#   =========================================================
+export USE_CHNL_ZCPY_LINK  := 0
+export USE_CHNL_PCPY_LINK  := 0
+export USE_MSGQ_ZCPY_LINK  := 0
+export USE_MSGQ_PCPY_LINK  := 0
+
+
+#   =========================================================
+#   Enable/ Disable trace
+#   =========================================================
+export TRACE               := 1
+
+
+#   =========================================================
+#   Enable/ Disable profiling
+#   =========================================================
+export PROFILE             := 1
+
+
+#   =========================================================
+#   Enable/ Disable probe
+#   =========================================================
+export PROBE               := 0
+
+
+#   =========================================================
+#   Platform Variant
+#   =========================================================
+export VARIANT             := DM6446
+
+
diff --git a/packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk b/packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk
new file mode 100644
index 0000000000..d0b27d7a55
--- /dev/null
+++ b/packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk
@@ -0,0 +1,223 @@
+#   ============================================================================
+#   @file   c64xx_5.xx_linux.mk
+#
+#   @path   $(DSPLINK)/make/DspBios/
+#
+#   @desc   This makefile defines OS specific macros used by MAKE system for
+#           the DSP/BIOS version 5.xx for C64XX on Linux.
+#
+#   @ver    1.50
+#   ============================================================================
+#   Copyright (c) Texas Instruments Incorporated 2002-2007
+#
+#   Use of this software is controlled by the terms and conditions found in the
+#   license agreement under which this software has been supplied or provided.
+#   ============================================================================
+
+
+ifndef C64XX_5_XX_LINUX_MK
+
+define C64XX_5_XX_LINUX_MK
+endef
+
+
+#   ============================================================================
+#   Let the make system know that a specific distribution for the GPP OS
+#   is being used.
+#   ============================================================================
+USE_DISTRIBUTION := 1
+
+
+#   ============================================================================
+#   Set the values of necessary variables to be used for the OS.
+#   ============================================================================
+
+#   ----------------------------------------------------------------------------
+#   Base directory for the DSP OS
+#   ----------------------------------------------------------------------------
+BASE_INSTALL    := /opt/ti-tools
+BASE_SABIOS     := $(BASE_INSTALL)/bios
+BASE_BUILDOS    := $(BASE_SABIOS)/packages/ti/bios
+
+#   ----------------------------------------------------------------------------
+#   Base directory for the XDC tools
+#   ----------------------------------------------------------------------------
+XDCTOOLS_DIR    := $(BASE_SABIOS)/xdctools
+
+#   ----------------------------------------------------------------------------
+#   Base for code generation tools - compiler, linker, archiver etc.
+#   ----------------------------------------------------------------------------
+BASE_CGTOOLS    := $(BASE_INSTALL)/c6000/cgtools
+BASE_CGTOOLSBIN := $(BASE_CGTOOLS)/bin
+
+#   ----------------------------------------------------------------------------
+#   Base for TCONF, platform files and dependent components
+#   ----------------------------------------------------------------------------
+BASE_TCONF      := $(XDCTOOLS_DIR)
+BASE_PLATFORMS  := $(BASE_SABIOS)/packages
+BASE_CSL        := $(BASE_INSTALL)/c6000/csl
+BASE_PSL        := $(BASE_SABIOS)/packages/ti/psl
+BASE_RTDX       := $(BASE_SABIOS)/packages/ti/rtdx
+
+
+#   ----------------------------------------------------------------------------
+#   Base directory for include files
+#   ----------------------------------------------------------------------------
+BASE_OSINC      := $(BASE_BUILDOS)/include
+BASE_CGTOOLSINC := $(BASE_CGTOOLS)/include
+BASE_RTDXINC    := $(BASE_RTDX)/include/c6000
+BASE_PSLINC     := $(BASE_PSL)/include
+BASE_CSLINC     := $(BASE_CSL)/include
+
+OSINC_GENERIC   := $(BASE_OSINC)
+OSINC_PLATFORM  := $(BASE_CGTOOLSINC) $(BASE_CSLINC)  $(BASE_RTDXINC)  $(BASE_PSLINC)
+
+
+ifeq ($(PLATFORM), morpheus_dev)
+OSINC_PLATFORM  += $(BASE_INSTALL)/boards/evmdm642/include
+endif # ifeq ($(PLATFORM), morpheus_dev)
+
+ifneq ("$(VARIANT)", "")
+OSINC_VARIANT   := $(BASE_OSINC)
+endif
+
+
+#   ----------------------------------------------------------------------------
+#   Base directory for libraries
+#   ----------------------------------------------------------------------------
+BASE_OSLIB      := $(BASE_BUILDOS)/lib
+BASE_CGTOOLSLIB := $(BASE_CGTOOLS)/lib
+BASE_RTDXLIB    := $(BASE_RTDX)/lib/c6000
+BASE_PSLLIB     := $(BASE_PSL)/lib
+BASE_CSLLIB     := $(BASE_CSL)/lib
+
+OSLIB_GENERIC   := $(BASE_OSLIB)
+OSLIB_PLATFORM  := $(BASE_CGTOOLSLIB) $(BASE_RTDXLIB) \
+                   $(BASE_PSLLIB) $(BASE_CSLLIB)
+
+ifeq ($(PLATFORM), morpheus_dev)
+OSLIB_PLATFORM  += $(BASE_INSTALL)/boards/evmdm642/lib
+endif # ifeq ($(PLATFORM), morpheus_dev)
+
+ifeq ($(PLATFORM), DM642_PCI)
+OSLIB_PLATFORM  += $(BASE_INSTALL)/boards/evmdm642/lib
+endif # ifeq ($(PLATFORM), DM642_PCI)
+
+ifneq ("$(VARIANT)", "")
+OSLIB_VARIANT   := $(BASE_OSLIB)
+endif
+
+
+#   ============================================================================
+#   COMPILER
+#   ============================================================================
+
+#   ----------------------------------------------------------------------------
+#   Name of the compiler
+#   ----------------------------------------------------------------------------
+COMPILER        := $(BASE_CGTOOLSBIN)/cl6x
+
+#   ----------------------------------------------------------------------------
+#   Command line switches used by the compiler
+#
+#   CC_SW_DEF       Command line defines
+#   CC_SW_INC       Search path for header files
+#   CC_SW_OBJ       Object file directory
+#   CC_SW_DEB       Include debug information
+#   CC_SW_REL       Release build
+#   ----------------------------------------------------------------------------
+CC_SW_DEF       := -d
+CC_SW_INC       := -I
+CC_SW_OBJ       := -fr
+CC_SW_DEB       := -g -d"_DEBUG"
+CC_SW_REL       := -o3
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the compiler
+#   ----------------------------------------------------------------------------
+STD_CC_FLAGS    := -q -pdr -pdv -pden -ml3 -mv6400 -d"CHIP_DM642"
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the compiler when building an executable
+#   ----------------------------------------------------------------------------
+EXE_CC_FLAGS    :=
+
+#   ----------------------------------------------------------------------------
+#   Flags for the compiler when building an archive
+#   ----------------------------------------------------------------------------
+ARC_CC_FLAGS    :=
+
+#   ----------------------------------------------------------------------------
+#   Standard definitions for the compiler
+#   ----------------------------------------------------------------------------
+STD_CC_DEFNS    :=
+
+
+#   ============================================================================
+#   ARCHIVER
+#   ============================================================================
+ARCHIVER        := $(BASE_CGTOOLSBIN)/ar6x
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the archiver
+#   ----------------------------------------------------------------------------
+STD_AR_FLAGS    := -r
+
+#   ----------------------------------------------------------------------------
+#   Archiver flags for extracting object files
+#   ----------------------------------------------------------------------------
+EXT_AR_FLAGS    := xq
+
+
+#   ============================================================================
+#   LINKER
+#   ============================================================================
+LINKER          := $(BASE_CGTOOLSBIN)/cl6x -z
+
+#   ----------------------------------------------------------------------------
+#   Command line switches used by the linker
+#
+#   LD_SW_INC       Search path for libraries
+#   LD_SW_LIB       Include library name
+#   LD_SW_OUT       Output file name
+#   LD_SW_MAP       Map file name
+#   LD_SW_RELOC     Generate relocateable output
+#   ----------------------------------------------------------------------------
+LD_SW_INC       := -i
+LD_SW_LIB       := -l
+LD_SW_OUT       := -o
+LD_SW_MAP       := -m
+LD_SW_RELOC     := -r
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the linker
+#   ----------------------------------------------------------------------------
+STD_LD_FLAGS    := -c  -x
+
+#   ----------------------------------------------------------------------------
+#   Flags for the linker when building an executable
+#   ----------------------------------------------------------------------------
+EXE_LD_FLAGS    :=
+
+ifeq ($(PLATFORM), morpheus_dev)
+EXE_LD_FLAGS    += $(LD_SW_LIB)"cslDM642.lib"
+EXE_LD_FLAGS    += $(LD_SW_LIB)"morpheus.lib"
+endif # ifeq ($(PLATFORM), morpheus_dev)
+
+ifeq ($(PLATFORM), DM642_PCI)
+EXE_LD_FLAGS    += $(LD_SW_LIB)"cslDM642.lib"
+endif # ifeq ($(PLATFORM), DM642_PCI)
+
+#   ============================================================================
+#   TCONF
+#   ============================================================================
+TCONF           := $(BASE_TCONF)/tconf
+
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for TCONF
+#   ----------------------------------------------------------------------------
+STD_TCF_FLAGS   :=
+
+
+endif   # ifndef C64XX_5_XX_LINUX_MK
diff --git a/packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk b/packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk
new file mode 100644
index 0000000000..d29adc0582
--- /dev/null
+++ b/packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk
@@ -0,0 +1,201 @@
+#   ============================================================================
+#   @file   davinci_mvlpro5.0.mk
+#
+#   @path   $(DSPLINK)/make/Linux/
+#
+#   @desc   This makefile defines OS specific macros used by MAKE system for
+#           the Montavista Pro 5.0 Linux distribution.
+#
+#   @ver    1.50
+#   ============================================================================
+#   Copyright (c) Texas Instruments Incorporated 2002-2007
+#
+#   Use of this software is controlled by the terms and conditions found in the
+#   license agreement under which this software has been supplied or provided.
+#   ============================================================================
+
+
+ifndef DAVINCI_MVLPRO5_0_MK
+
+define DAVINCI_MVLPRO5_0_MK
+endef
+
+
+#   ============================================================================
+#   Let the make system know that a specific distribution for the GPP OS
+#   is being used.
+#   ============================================================================
+USE_DISTRIBUTION := 1
+
+
+#   ============================================================================
+#   Set the values of necessary variables to be used for the OS.
+#   ============================================================================
+
+#   ----------------------------------------------------------------------------
+#   Base directory for the GPP OS
+#   ----------------------------------------------------------------------------
+BASE_BUILDOS    := ${HOME}/montavista/kernel/Linux
+
+#   ----------------------------------------------------------------------------
+#   Base for code generation tools - compiler, linker, archiver etc.
+#   ----------------------------------------------------------------------------
+BASE_CGTOOLS    := /opt/montavista/pro/devkit/arm/v5t_le/bin
+
+#   ----------------------------------------------------------------------------
+#   Base directory for include files provided by GPP OS
+#   ----------------------------------------------------------------------------
+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
+
+ifneq ("$(VARIANT)", "")
+OSINC_VARIANT   := $(BASE_OSINC)
+endif
+
+
+#   ----------------------------------------------------------------------------
+#   Base directory for libraries provided by GPP OS
+#   ----------------------------------------------------------------------------
+BASE_OSLIB      := /opt/montavista/pro/devkit/arm/v5t_le/lib
+
+OSLIB_GENERIC   := $(BASE_OSLIB)
+OSLIB_PLATFORM  := $(BASE_OSLIB)
+
+
+ifneq ("$(VARIANT)", "")
+OSLIB_VARIANT   := $(BASE_OSLIB)
+endif
+
+
+#   ============================================================================
+#   COMPILER
+#   ============================================================================
+
+#   ----------------------------------------------------------------------------
+#   Name of the compiler
+#   ----------------------------------------------------------------------------
+COMPILER        := $(BASE_CGTOOLS)/arm_v5t_le-gcc
+LD              := $(BASE_CGTOOLS)/arm_v5t_le-ld
+
+CROSS_COMPILE   := arm_v5t_le-
+export CROSS_COMPILE
+
+#   ----------------------------------------------------------------------------
+#   Command line switches used by the compiler
+#
+#   CC_SW_DEF       Command line defines
+#   CC_SW_INC       Search path for header files
+#   CC_SW_OBJ       Create object file
+#   CC_SW_DEB       Include debug information
+#   ----------------------------------------------------------------------------
+CC_SW_DEF       := -D
+CC_SW_INC       := -I
+CC_SW_OBJ       := -o
+CC_SW_DEB       := -g
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the compiler
+#   ----------------------------------------------------------------------------
+STD_KRNL_FLAGS  := -c -iwithprefix include -Iinclude -Wall  -Wstrict-prototypes\
+                   -Wno-trigraphs -fno-strict-aliasing -fno-common             \
+                   -fno-omit-frame-pointer -mapcs -mno-sched-prolog            \
+                   -mlittle-endian -D__LINUX_ARM_ARCH__=5 -march=armv5t        \
+                   -mtune=arm9tdmi  -msoft-float -Uarm -mapcs                  \
+                   -Wdeclaration-after-statement -Os -marm  -mabi=aapcs-linux
+STD_USER_FLAGS  := -mlittle-endian -march=armv5t -mtune=arm9tdmi  -msoft-float \
+                  -Uarm -Wdeclaration-after-statement -marm -Wall              \
+                  -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing      \
+                  -fno-common -fno-omit-frame-pointer -mapcs -c                \
+                  -mabi=aapcs-linux
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the compiler when building an executable
+#   ----------------------------------------------------------------------------
+EXE_CC_FLAGS    :=
+
+#   ----------------------------------------------------------------------------
+#   Flags for the compiler when building a driver
+#   ----------------------------------------------------------------------------
+DRV_CC_FLAGS    := -nostdinc
+
+#   ----------------------------------------------------------------------------
+#   Flags for the compiler when building a library
+#   ----------------------------------------------------------------------------
+LIB_CC_FLAGS    :=
+
+#   ----------------------------------------------------------------------------
+#   Standard definitions for the compiler
+#   ----------------------------------------------------------------------------
+STD_CC_DEFNS    := -D_REENTRANT
+
+
+#   ============================================================================
+#   ARCHIVER1 - This denotes the linker.
+#   ============================================================================
+ARCHIVER1        := $(BASE_CGTOOLS)/arm_v5t_le-ld
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the archiver
+#   ----------------------------------------------------------------------------
+STD_AR_FLAGS1    := -EL -r
+
+
+#   ============================================================================
+#   ARCHIVER2 - This denotes the archiver.
+#   ============================================================================
+ARCHIVER2        := $(BASE_CGTOOLS)/arm_v5t_le-ar
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the archiver
+#   ----------------------------------------------------------------------------
+STD_AR_FLAGS2    := -r
+
+
+#   ============================================================================
+#   LINKER - The compiler is used for linking purpose as well.
+#   ============================================================================
+LINKER      := $(BASE_CGTOOLS)/arm_v5t_le-gcc
+
+#   ----------------------------------------------------------------------------
+#   Command line switches used by the linker
+#
+#   LD_SW_LIB       Search path for libraries
+#   LD_SW_OUT       Output filename
+#   LD_SW_RELOC     Generate relocateable output
+#   ----------------------------------------------------------------------------
+LD_SW_LIB       := -L
+LD_SW_OUT       := -o
+LD_SW_RELOC     := -r
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the linker
+#   ----------------------------------------------------------------------------
+STD_LD_FLAGS    :=
+
+#   ----------------------------------------------------------------------------
+#   Specific flags for the linker if linking and module generating utility are
+#   different
+#   ----------------------------------------------------------------------------
+SPECIFIC_LD_FLAGS    :=  -lpthread
+
+#   ----------------------------------------------------------------------------
+#   Flags for the linker when building an executable
+#   ----------------------------------------------------------------------------
+EXE_LD_FLAGS    := -lc
+
+#   ----------------------------------------------------------------------------
+#   Flags for the linker when building a driver
+#   ----------------------------------------------------------------------------
+DRV_LD_FLAGS    :=
+
+
+#   ============================================================================
+#   Post processing utilities for Linux 2.6
+#   ============================================================================
+CMD_MODPOST     := $(BASE_BUILDOS)/scripts/mod/modpost -i $(BASE_BUILDOS)/Module.symvers $(BASE_BUILDOS)/vmlinux
+
+
+endif   # ifndef DAVINCI_MVLPRO5_0_MK
diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
index a822cf1be4..9d0e1134d8 100644
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -6,8 +6,12 @@ PR = "r0"
 
 # Get dsplink tarball from TI website, place in sources and calculate
 # md5sum
-# https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
+# 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 \
 "
 
 S = "${WORKDIR}/dsplink_1_50/dsplink"
@@ -16,10 +20,13 @@ S = "${WORKDIR}/dsplink_1_50/dsplink"
 export DSPLINK = "${S}"
 
 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
 }
 
 do_compile () {
-sh ${S}/etc/host/scripts/Linux/buildmodule.sh
+	make -C ${S}/dsplink/gpp/src
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"