merge of '027df8bfceecb5d21ab2b2b76d0d191124b3446b'

     and 'daafad010cbf738246a5e77122c2e1e4f951c9f5'

62 files changed, 71 insertions, 2410 deletions

diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index d9c3c07e02..9e9dff888f 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -11,6 +11,13 @@ S = "${WORKDIR}/dsplink_1_50/dsplink"
 # Needed for buildscripts
 export DSPLINK = "${S}"
 
+# Path to the dir where the TI tools are unpacked
+TITOOLSDIR ?= "/OE/TI"
+# Path under TITOOLSDIR where dspbios is unpacked 
+TIBIOSDIR ?= "bios_5_32_03"
+# Path under TITOOLSDIR where the dsp toolchain is unpacked
+TICGTOOLSDIR ?= "cg6x_6_1_2"
+
 DSPLINKPLATFORM ?= "Davinci"
 
 DSPLINKPLATFORM_omap5912osk = "OMAP"
@@ -48,6 +55,8 @@ KERNELARMFLAGS_armv7a = "-c -nostdinc -include $(BASE_OSINC)/linux/autoconf.h -i
                    -Wdeclaration-after-statement -Os -marm  -mabi=aapcs-linux \
                    -D__KERNEL__ -mno-thumb-interwork   -msoft-float -fno-optimize-sibling-calls -g  -fno-stack-protector -Wno-pointer-sign -g -DUSE_UDEV=1 -DOS_LINUX -DLINUX_KERNEL"
 
+DSPFLAGS = "-q -pdr -pdv -pden -ml3 -mv64+ "
+
 export DSPLINKPLATFORM 
 export DSPLINKDSP
 
@@ -59,7 +68,7 @@ do_configure () {
 	sed -i 	-e s:SED_ME_SOURCEDIR:${S}:g \
 		-e s:SED_ME_GPPDISTRO:openembedded:g \
 		-e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \
-		-e s:SED_ME_DSPDISTRO:openembedded:g \
+		-e s:SED_ME_DSPDISTRO:c64xx_5.xx_linux:g \
 		-e s:SED_ME_PLATFORM:${DSPLINKPLATFORM}:g \
 		-e s:SED_ME_DSP:${DSPLINKDSP}:g \
 		-e s:SED_ME_SOC:${DSPLINKSOC}:g \	
@@ -73,6 +82,11 @@ do_configure () {
 		-e 's:SEDME_USER_ARMFLAGS:${USERARMFLAGS}:g' \
 		${S}/make/Linux/openembedded.mk 
 
+	sed -i -e s:SEDME_TITOOLS_BASEPATH:${TITOOLSDIR}:g \
+		-e s:SEDME_BIOSUNPACKDIR:${TIBIOSDIR}:g \	
+		-e s:SEDME_CGTOOLSDIR:${TICGTOOLSDIR}:g \	
+		-e 's:SEDME_DSPFLAGS:${DSPFLAGS}:g' \
+		${S}/make/DspBios/c64xx_5.xx_linux.mk
 }
 
 PARALLEL_MAKE = ""
@@ -92,6 +106,9 @@ do_compile () {
 	
 	sed -i -e 's:gcc${KERNEL_CCSUFFIX}:gcc:' ${S}/make/Linux/openembedded.mk
 	oe_runmake -C ${S}/gpp/src/samples
+
+	oe_runmake -C ${S}/dsp/src
+	oe_runmake -C ${S}/dsp/src/samples
 }
 
 do_install () {
diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
index cba9bf1f97..9132389923 100644
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -1,6 +1,6 @@
 require dsplink.inc
 
-PR = "r8"
+PR = "r9"
 PE = "1"
 PV = "1.50"
 
diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb
index d4a71b437e..36ac50f4cf 100644
--- a/packages/dsplink/dsplink_1.51.00.08.bb
+++ b/packages/dsplink/dsplink_1.51.00.08.bb
@@ -1,6 +1,6 @@
 require dsplink.inc
 
-PR = "r8"
+PR = "r9"
 PE = "1"
 PV = "1.51"
 
diff --git a/packages/dsplink/files/CURRENTCFG.MK b/packages/dsplink/files/CURRENTCFG.MK
index 1f932f2b77..55959854e1 100644
--- a/packages/dsplink/files/CURRENTCFG.MK
+++ b/packages/dsplink/files/CURRENTCFG.MK
@@ -48,7 +48,7 @@ export DSPPLATFORM         := SED_ME_PLATFORM
 #   Target GPP and DSP devices
 #   =========================================================
 export GPPDEVICE           := SED_ME_PLATFORM
-export DSPDEVICE           := SED_ME_DSP 
+export DSPDEVICE           := SED_ME_DSP
 
 
 #   =========================================================
diff --git a/packages/dsplink/files/c64xx_5.xx_linux.mk b/packages/dsplink/files/c64xx_5.xx_linux.mk
index d0b27d7a55..ea806fff4e 100644
--- a/packages/dsplink/files/c64xx_5.xx_linux.mk
+++ b/packages/dsplink/files/c64xx_5.xx_linux.mk
@@ -35,8 +35,8 @@ USE_DISTRIBUTION := 1
 #   ----------------------------------------------------------------------------
 #   Base directory for the DSP OS
 #   ----------------------------------------------------------------------------
-BASE_INSTALL    := /opt/ti-tools
-BASE_SABIOS     := $(BASE_INSTALL)/bios
+BASE_INSTALL    := SEDME_TITOOLS_BASEPATH
+BASE_SABIOS     := $(BASE_INSTALL)/SEDME_BIOSUNPACKDIR
 BASE_BUILDOS    := $(BASE_SABIOS)/packages/ti/bios
 
 #   ----------------------------------------------------------------------------
@@ -47,7 +47,7 @@ XDCTOOLS_DIR    := $(BASE_SABIOS)/xdctools
 #   ----------------------------------------------------------------------------
 #   Base for code generation tools - compiler, linker, archiver etc.
 #   ----------------------------------------------------------------------------
-BASE_CGTOOLS    := $(BASE_INSTALL)/c6000/cgtools
+BASE_CGTOOLS    := $(BASE_INSTALL)/SEDME_CGTOOLSDIR
 BASE_CGTOOLSBIN := $(BASE_CGTOOLS)/bin
 
 #   ----------------------------------------------------------------------------
@@ -135,7 +135,7 @@ CC_SW_REL       := -o3
 #   ----------------------------------------------------------------------------
 #   Standard flags for the compiler
 #   ----------------------------------------------------------------------------
-STD_CC_FLAGS    := -q -pdr -pdv -pden -ml3 -mv6400 -d"CHIP_DM642"
+STD_CC_FLAGS    := SEDME_DSPFLAGS -d"CHIP_DM642"
 
 #   ----------------------------------------------------------------------------
 #   Standard flags for the compiler when building an executable
diff --git a/packages/freesmartphone/python-odeviced/odeviced b/packages/freesmartphone/python-odeviced/odeviced
deleted file mode 100644
index 52d3a1d196..0000000000
--- a/packages/freesmartphone/python-odeviced/odeviced
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# odeviced  This shell script starts and stops the open device daemon.
-#
-# chkconfig: 345 90 20
-# description: py-odeviced is the open device daemon
-# processname: python
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=odeviced
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-        echo -n "Starting open device daemon: "
-        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/odeviced
-        if [ $? = 0 ]; then
-            echo "(ok)"
-        else
-            echo "(failed)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping open device daemon: "
-        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
-        rm -f /var/run/${NAME}.pid
-        echo "(done)"
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/odeviced {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/freesmartphone/python-odeviced/odeviced.conf b/packages/freesmartphone/python-odeviced/odeviced.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/freesmartphone/python-odeviced/odeviced.conf
+++ /dev/null
diff --git a/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf b/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
deleted file mode 100644
index 0076639f98..0000000000
--- a/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[idlenotifier]
-# don't read from accellerometers for now
-ignoreinput=2,3
-
-[input]
-# don't read from accellerometers for now
-ignoreinput=2,3
-
diff --git a/packages/freesmartphone/python-odeviced_git.bb b/packages/freesmartphone/python-odeviced_git.bb
deleted file mode 100644
index 121a434585..0000000000
--- a/packages/freesmartphone/python-odeviced_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "The Open Device Daemon Prototype in Python"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenDeviceDaemon"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-SECTION = "console/network"
-DEPENDS = "python-cython-native python-pyrex-native"
-LICENSE = "GPLv2"
-PV = "0.7.9+gitr${SRCREV}"
-PR = "r2"
-
-inherit distutils update-rc.d
-
-INITSCRIPT_NAME = "odeviced"
-INITSCRIPT_PARAMS = "defaults 21"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/python-odeviced.git;protocol=git;branch=master \
-           file://odeviced \
-           file://odeviced.conf"
-S = "${WORKDIR}/git"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/odeviced ${D}${sysconfdir}/init.d/
-	install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir}
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/
-}
-
-RDEPENDS_${PN} += "\
-  python-dbus \
-  python-pygobject \
-  python-pyrtc \
-  python-syslog \
-"
-
-FILES_${PN} += "${sysconfdir}"
diff --git a/packages/freesmartphone/python-oeventd/.mtn2git_empty b/packages/freesmartphone/python-oeventd/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/freesmartphone/python-oeventd/.mtn2git_empty
+++ /dev/null
diff --git a/packages/freesmartphone/python-oeventd/oeventd b/packages/freesmartphone/python-oeventd/oeventd
deleted file mode 100644
index 8ed467b079..0000000000
--- a/packages/freesmartphone/python-oeventd/oeventd
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# odeviced  This shell script starts and stops the open event daemon.
-#
-# chkconfig: 345 90 20
-# description: py-oeventd is the open evend daemon
-# processname: python
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=oeventd
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-        echo -n "Starting open event daemon: "
-        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/oeventd
-        if [ $? = 0 ]; then
-            echo "(ok)"
-        else
-            echo "(failed)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping open event daemon: "
-        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
-        rm -f /var/run/${NAME}.pid
-        echo "(done)"
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/oeventd {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/freesmartphone/python-oeventd_git.bb b/packages/freesmartphone/python-oeventd_git.bb
deleted file mode 100644
index c08e1af3b7..0000000000
--- a/packages/freesmartphone/python-oeventd_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "The Open Event Daemon Prototype in Python"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenEventDaemon"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-SECTION = "console/network"
-DEPENDS = "python-cython-native python-pyrex-native"
-LICENSE = "GPLv2"
-PV = "0.0.0+gitr${SRCREV}"
-PR = "r1"
-
-inherit distutils update-rc.d
-
-INITSCRIPT_NAME = "oeventd"
-INITSCRIPT_PARAMS = "defaults 21"
-
-SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/eventd.git;protocol=git;branch=master \
-  file://oeventd \
-"
-S = "${WORKDIR}/git"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/oeventd ${D}${sysconfdir}/init.d/
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	mv -f ${D}${datadir}/etc/dbus-1/system.d/oeventd.conf ${D}${sysconfdir}/dbus-1/system.d/
-}
-
-RDEPENDS_${PN} += "\
-  python-dbus \
-  python-pygobject \
-  python-syslog \
-"
-
-FILES_${PN} += "${sysconfdir}"
diff --git a/packages/freesmartphone/python-ophoned/.mtn2git_empty b/packages/freesmartphone/python-ophoned/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/freesmartphone/python-ophoned/.mtn2git_empty
+++ /dev/null
diff --git a/packages/freesmartphone/python-ophoned/ophoned b/packages/freesmartphone/python-ophoned/ophoned
deleted file mode 100644
index edc800711a..0000000000
--- a/packages/freesmartphone/python-ophoned/ophoned
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# ophoned  This shell script starts and stops the open phone daemon.
-#
-# chkconfig: 345 90 20
-# description: py-ophoned is the open phone daemon
-# processname: python
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=ophoned
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-        echo -n "Starting open phone daemon: "
-        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ophoned
-        if [ $? = 0 ]; then
-            echo "(ok)"
-        else
-            echo "(failed)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping open phone daemon: "
-        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
-        rm -f /var/run/${NAME}.pid
-        echo "(done)"
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/ophoned {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/freesmartphone/python-ophoned_git.bb b/packages/freesmartphone/python-ophoned_git.bb
deleted file mode 100644
index 7f30f4c24a..0000000000
--- a/packages/freesmartphone/python-ophoned_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "The Open Phone Daemon (Python Implementation)"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenPhoneServer"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-SECTION = "console/network"
-DEPENDS = "python-cython-native python-pyrex-native"
-LICENSE = "GPLv2"
-PV = "0.0.0+gitr${SRCREV}"
-PR = "r1"
-
-inherit distutils update-rc.d
-
-INITSCRIPT_NAME = "ophoned"
-INITSCRIPT_PARAMS = "defaults 21"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/python-ophoned.git;protocol=git;branch=master \
-           file://ophoned"
-S = "${WORKDIR}/git"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/ophoned ${D}${sysconfdir}/init.d/
-#	install -m 0644 ${WORKDIR}/ophoned.conf ${D}${sysconfdir}
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	mv -f ${D}${datadir}/etc/dbus-1/system.d/ophoned.conf ${D}${sysconfdir}/dbus-1/system.d/
-}
-
-RDEPENDS_${PN} += "\
-  python-dbus \
-  python-pygobject \
-  python-pyrtc \
-  python-pyserial \
-  python-syslog \
-"
-
-FILES_${PN} += "${sysconfdir}"
diff --git a/packages/freesmartphone/python-ousaged/.mtn2git_empty b/packages/freesmartphone/python-ousaged/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/freesmartphone/python-ousaged/.mtn2git_empty
+++ /dev/null
diff --git a/packages/freesmartphone/python-ousaged/ousaged b/packages/freesmartphone/python-ousaged/ousaged
deleted file mode 100644
index 7b62d7f93c..0000000000
--- a/packages/freesmartphone/python-ousaged/ousaged
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# odeviced  This shell script starts and stops the open device daemon.
-#
-# chkconfig: 345 90 20
-# description: py-ousaged is the open usage daemon
-# processname: python
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=odeviced
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-        echo -n "Starting open usage daemon: "
-        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ousaged
-        if [ $? = 0 ]; then
-            echo "(ok)"
-        else
-            echo "(failed)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping open usage daemon: "
-        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
-        rm -f /var/run/${NAME}.pid
-        echo "(done)"
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/ousaged {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/freesmartphone/python-ousaged_git.bb b/packages/freesmartphone/python-ousaged_git.bb
deleted file mode 100644
index 1188da