merge of 'b0ae8d7e97486b45257d7443b82c3e7bd318a2a9'

     and 'c623b8256cde670674edff5cc4131f32826906df'

16 files changed, 591 insertions, 13 deletions

diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
index a822cf1be4..7051966ffc 100644
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -1,13 +1,20 @@
 DESCRIPTION = "DSP Link for TI ARM/DSP processors"
 
-DEPENDS = "virtual/kernel"
+DEPENDS = "virtual/kernel perl-native"
+
+inherit module-base
 
 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
-SRC_URI ="http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
+# 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 \
+	   file://prcs-fix-include.patch;patch=1 \
 "
 
 S = "${WORKDIR}/dsplink_1_50/dsplink"
@@ -16,10 +23,31 @@ 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
+
+	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 () {
-sh ${S}/etc/host/scripts/Linux/buildmodule.sh
+	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/files/CURRENTCFG.MK b/packages/dsplink/files/CURRENTCFG.MK
new file mode 100644
index 0000000000..ff109de482
--- /dev/null
+++ b/packages/dsplink/files/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             := SED_ME_SOURCEDIR/gpp
+export DSPROOT             := SED_ME_SOURCEDIR/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     := SED_ME_GPPDISTRO
+export GPPOSVERSION        := SED_ME_KERNELVERSION
+export GPPOSVARIANT        := 
+export DSPDISTRIBUTION     := SED_ME_DSPDISTRO
+
+
+#   =========================================================
+#   Target GPP and DSP platforms for DSP/BIOS LINK
+#   =========================================================
+export GPPPLATFORM         := SED_ME_PLATFORM
+export DSPPLATFORM         := SED_ME_PLATFORM
+
+
+#   =========================================================
+#   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/files/c64xx_5.xx_linux.mk b/packages/dsplink/files/c64xx_5.xx_linux.mk
new file mode 100644
index 0000000000..d0b27d7a55
--- /dev/null
+++ b/packages/dsplink/files/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/files/davinci_mvlpro5.0.mk b/packages/dsplink/files/davinci_mvlpro5.0.mk
new file mode 100644
index 0000000000..2ea2fd8915
--- /dev/null
+++ b/packages/dsplink/files/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    := SED_ME_KERNELDIR
+
+#   ----------------------------------------------------------------------------
+#   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  := SED_ME_CROSS/4.2.0/include
+OSINC_TARGET    := SED_ME_STAGINGDIR/usr/include
+
+ifneq ("$(VARIANT)", "")
+OSINC_VARIANT   := $(BASE_OSINC)
+endif
+
+
+#   ----------------------------------------------------------------------------
+#   Base directory for libraries provided by GPP OS
+#   ----------------------------------------------------------------------------
+BASE_OSLIB      := SED_ME_STAGINGDIR/lib
+
+OSLIB_GENERIC   := $(BASE_OSLIB)
+OSLIB_PLATFORM  := $(BASE_OSLIB)
+
+
+ifneq ("$(VARIANT)", "")
+OSLIB_VARIANT   := $(BASE_OSLIB)
+endif
+
+
+#   ============================================================================
+#   COMPILER
+#   ============================================================================
+
+#   ----------------------------------------------------------------------------
+#   Name of the compiler
+#   ----------------------------------------------------------------------------
+COMPILER        := SED_ME_TARGET_PREFIXgcc
+LD              := SED_ME_TARGET_PREFIXDIR-ld
+
+CROSS_COMPILE   := SED_ME_TARGET_PREFIX
+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        := SED_ME_TARGET_PREFIX-ld
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the archiver
+#   ----------------------------------------------------------------------------
+STD_AR_FLAGS1    := -EL -r
+
+
+#   ============================================================================
+#   ARCHIVER2 - This denotes the archiver.
+#   ============================================================================
+ARCHIVER2        := SED_ME_TARGET_PREFIX-ar
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the archiver
+#   ----------------------------------------------------------------------------
+STD_AR_FLAGS2    := -r
+
+
+#   ============================================================================
+#   LINKER - The compiler is used for linking purpose as well.
+#   ============================================================================
+LINKER      := SED_ME_TARGET_PREFIXgcc
+
+#   ----------------------------------------------------------------------------
+#   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/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>
diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb
index 26c257b57f..243354cc91 100644
--- a/packages/freesmartphone/mickeyterm_git.bb
+++ b/packages/freesmartphone/mickeyterm_git.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Mickey's Terminal Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
-DEPENDS = "python-serial"
 LICENSE = "GPLv2"
 PV = "2.9.0+gitr${SRCREV}"
 PR = "r0"
@@ -16,7 +15,7 @@ do_install() {
 
 RDEPENDS_${PN} = "\
   python-readline \
-  python-serial \
+  python-pyserial \
   python-textutils \
   python-threading \
 "
diff --git a/packages/freesmartphone/python-ophoned_git.bb b/packages/freesmartphone/python-ophoned_git.bb
index ebfe0c4b13..e494719bec 100644
--- a/packages/freesmartphone/python-ophoned_git.bb
+++ b/packages/freesmartphone/python-ophoned_git.bb
@@ -28,6 +28,7 @@ RDEPENDS_${PN} += "\
   python-dbus \
   python-pygobject \
   python-pyrtc \
+  python-pyserial \
   python-syslog \
 "
 
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
new file mode 100644
index 0000000000..7fe6742069
--- /dev/null
+++ b/packages/freesmartphone/zhone_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Zhone: Zen Phone"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "edje-native"
+RDEPENDS = "task-python-efl python-textutils"
+PV = "0.0.0+gitr${SRCREV}"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}"
diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
index 1392b3e830..5691fb647a 100644
--- a/packages/gcc/gcc-4.2.2.inc
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -76,6 +76,6 @@ FORTRAN = ""
 FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
-EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
 
 ARM_INSTRUCTION_SET = "arm"
diff --git a/packages/gcc/gcc-4.3.0.inc b/packages/gcc/gcc-4.3.0.inc
index 02ceea7364..96b7d02501 100644
--- a/packages/gcc/gcc-4.3.0.inc
+++ b/packages/gcc/gcc-4.3.0.inc
@@ -67,5 +67,5 @@ SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 FORTRAN = ""
 JAVA = ""
 
-EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = " --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
 
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 4149179d8e..dc3ee94a52 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.0.bb b/packages/gcc/gcc-cross_4.3.0.bb
index f51e60ce13..9821d3cd83 100644
--- a/packages/gcc/gcc-cross_4.3.0.bb
+++ b/packages/gcc/gcc-cross_4.3.0.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index c5a7a93f31..85fcaecec7 100644
--- a/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require gcc-csl-arm-2008q1.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-csl-arm-2008q1.inc b/packages/gcc/gcc-csl-arm-2008q1.inc
index d5cc41d376..d4f6ef1e37 100644
--- a/packages/gcc/gcc-csl-arm-2008q1.inc
+++ b/packages/gcc/gcc-csl-arm-2008q1.inc
@@ -44,7 +44,7 @@ FORTRAN = ""
 #FORTRAN_linux-gnueabi = ",fortran"
 #JAVA = ",java"
 
-EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
 ARM_INSTRUCTION_SET = "arm"
 
 addtask unpack2 after do_unpack before do_patch
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index 54294f4fa6..b95ef88e6f 100644
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -2,11 +2,13 @@ INHIBIT_PACKAGE_STRIP ?= ""
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-PACKAGES = "libgcc libstdc++ libg2c libgfortran"
+PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
 
 # Called from within gcc-cross, so libdir is set wrong
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
 
+FILES_libssp = "${target_libdir}/libssp.so.*"
+
 FILES_libgfortran = "${target_libdir}/libgfortran.so.*"
 
 FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
@@ -40,11 +42,13 @@ do_install () {
            mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true 	
 
         else
            mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true
         fi