Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

39 files changed, 1601 insertions, 242 deletions

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 82b5311ef5..adb57f6cc9 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -134,7 +134,7 @@ autotools_do_configure() {
 	;;
 	esac
 	if [ -e ${S}/configure ]; then
-		oe_runconf
+		oe_runconf $@
 	else
 		oenote "nothing to configure"
 	fi
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6d025702e2..c735e690d7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2946,6 +2946,10 @@ sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
 md5=32b0df93b285ee094e053552d9301cb6
 sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321
 
+[http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz]
+md5=6cacb7db6eb61c64395be4ddc737095d
+sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797
+
 [http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz]
 md5=d8f3bbfbcc337d9776991d9561f451f3
 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d
@@ -4414,6 +4418,10 @@ sha256=4dcbdbd253b1978dcd70452780d7804ade912f4ede90f122f30d5322f53c5c3e
 md5=4e353edd6481f67ee534a40d4b7f3b8c
 sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b
 
+[http://ftp.gnome.org/pub/GNOME/sources/evince/2.24/evince-2.24.1.tar.bz2]
+md5=ad0e463ab1fe596fc52c03403a9b9f1e
+sha256=d8803313e2a0b3fa3fe20fe613ac3ec85ec6848d5d446dd02e9cc5be8194f65c
+
 [http://enlightenment.freedesktop.org/files/ewl-0.0.4.007.tar.gz]
 md5=29bc8aec80b53480c2ea53aea1796e15
 sha256=0a0dba00517013082b8e094b4b7753162cf5fb71a170eb54cbc2eaa35717d5f6
@@ -6502,6 +6510,10 @@ sha256=af2ebf32fe93817e06333b94d3fabcf72fa5675f402c1bbdb7bed3be0b3b3a3e
 md5=23bf4e795725a74ebb37daacda784adb
 sha256=3105dfb490c187adbe1c14582daa5a134ec672c396af3dd4e0e29cc9fbb4a6ea
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.25/gnome-games-2.25.1.tar.bz2]
+md5=886ab09752d3b420b744865342f07eb0
+sha256=a29eca01be141a9208ef2be3dc497d05faf4d2c0ca3e3d9edeec611ca3388b28
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-2.6.1.tar.bz2]
 md5=6ea145547bfd8aa828b22cbbe34cbedf
 sha256=d7a823601f569589437d671d12b1b12f53abc08aeb7d25280bb3242299353086
@@ -19992,10 +20004,6 @@ sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
 
 [http://downloads.sourceforge.net/wesnoth/wesnoth-1.4.5.tar.bz2]
 md5=09b7b76d4a4eedf502f38df9d551d827
-sha256=
-
-[http://heanet.dl.sourceforge.net/wesnoth/wesnoth-1.4.5.tar.bz2]
-md5=09b7b76d4a4eedf502f38df9d551d827
 sha256=ce4b00b85fd26cbb7b7362b405648f422d3c228df4236eac8ce2f464182cf750
 
 [ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz]
@@ -22594,6 +22602,10 @@ sha256=9a0687812eaceaccc21d55dead47f1fbecf8300a28604bd2c08aae6ff7874cd0
 md5=d16f5a033f001c9069b4141194614da2
 sha256=2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.5.3.tar.bz2]
+md5=308971036e25250e7fe3cccfd5a120f8
+sha256=a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index cf668e9e0f..cc5be470d2 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -105,8 +105,8 @@ ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
 ANGSTROM_GCC_VERSION 			?= "4.2.4"
-PREFERRED_VERSION_binutils-cross 	?= "2.19"
-PREFERRED_VERSION_binutils-cross-sdk 	?= "2.19"
+PREFERRED_VERSION_binutils-cross 	?= "2.18.50.0.7"
+PREFERRED_VERSION_binutils-cross-sdk 	?= "2.18.50.0.7"
 
 PREFERRED_VERSION_gcc                    ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross              ?= "${ANGSTROM_GCC_VERSION}"
@@ -116,6 +116,7 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-e-versions.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 
 #avr32 only has patches for binutils 2.17 in OE
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index c1dc088ead..e58eb40519 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -28,4 +28,3 @@ PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "124"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_xserver-xorg  = "1.5.1"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 48cbb49d2c..5d250074c5 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -21,6 +21,32 @@ CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}"
 DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
 require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
 
+# ARM920T and up can use thumb mode to decrease binary size at the expense of speed
+# (the complete story is a bit more nuanced due to cache starvation)
+# Angstrom turns on thumb for armv4t machine according to this RFC:
+# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html
+
+# We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
+ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
+ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
+
+ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
+# "arm" "thumb"
+#    The instruction set the compiler should use when generating application
+#    code.  The kernel is always compiled with arm code at present.  arm code
+#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
+#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
+#    but requires more instructions (140% for 70% smaller code) so may be
+#    slower.
+
+THUMB_INTERWORK = "yes"
+# "yes" "no"
+#    Whether to compile with code to allow interworking between the two
+#    instruction sets.  This allows thumb code to be executed on a primarily
+#    arm system and vice versa.  It is strongly recommended that DISTROs not
+#    turn this off - the actual cost is very small.
+
+
 #Use this variable in feeds and other parts that need a URI
 ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
 
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
new file mode 100644
index 0000000000..cf999a2a4d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -0,0 +1,3 @@
+# This file is for updates after X11R7.4 was released
+
+PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index 548d8239e8..46fa8d496a 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -191,6 +191,9 @@ PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
 PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
 PREFERRED_VERSION_xtrans ?= "1.2.1"
+
+# This should be here but is needed until bitbake can do
+# versioned depends
 PREFERRED_VERSION_mesa ?= "7.2"
 
 # proto
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index d36a6188df..a4a006f92c 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -60,6 +60,7 @@ PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 
 # for jalimo
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 PREFERRED_PROVIDER_classpath = "classpath"
 PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
 PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
diff --git a/packages/binutils/binutils_2.18.50.0.7.bb b/packages/binutils/binutils_2.18.50.0.7.bb
index d0656f6300..98b389fd53 100644
--- a/packages/binutils/binutils_2.18.50.0.7.bb
+++ b/packages/binutils/binutils_2.18.50.0.7.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require binutils.inc
 
diff --git a/packages/classpath/classpath-initial_0.93.bb b/packages/classpath/classpath-initial_0.93.bb
index 09bcde1b87..c36ea3813d 100644
--- a/packages/classpath/classpath-initial_0.93.bb
+++ b/packages/classpath/classpath-initial_0.93.bb
@@ -5,13 +5,13 @@ require classpath-native.inc
 
 DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native."
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "zip-native fastjar-native jikes-native gettext-native"
 
 SRC_URI += "\
 	file://autotools.patch;patch=1 \
-	file://miscompilation.patch;patch=1 \
+	file://miscompilation-0.93.patch;patch=1 \
 	"
 
 EXTRA_OECONF = "\
diff --git a/packages/classpath/files/miscompilation-0.93.patch b/packages/classpath/files/miscompilation-0.93.patch
new file mode 100644
index 0000000000..99db6f3003
--- /dev/null
+++ b/packages/classpath/files/miscompilation-0.93.patch
@@ -0,0 +1,13 @@
+Index: classpath-0.93/native/jni/java-io/java_io_VMFile.c
+===================================================================
+--- classpath-0.93.orig/native/jni/java-io/java_io_VMFile.c	2006-09-23 07:17:45.000000000 +0200
++++ classpath-0.93/native/jni/java-io/java_io_VMFile.c	2008-11-14 13:41:27.000000000 +0100
+@@ -239,7 +239,7 @@
+ {
+ #ifndef WITHOUT_FILESYSTEM
+   const char *filename;
+-  int result;
++  volatile int result;
+ 
+   /* Don't use the JCL convert function because it throws an exception
+      on failure */
diff --git a/packages/dsplink/cmemk.inc b/packages/dsplink/cmemk.inc
new file mode 100644
index 0000000000..1b7ea3ae0f
--- /dev/null
+++ b/packages/dsplink/cmemk.inc
@@ -0,0 +1,55 @@
+DESCRIPTION = "Codec Engine for TI ARM/DSP processors - cmemk module"
+
+DEPENDS = "virtual/kernel perl-native"
+RDEPENDS = "update-modules"
+
+inherit module
+
+require ti-paths.inc
+
+export DSPLINK="${S}/cetools/packages/dsplink"
+
+PARALLEL_MAKE = ""
+
+
+do_compile_append() {
+	echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make		
+	echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make
+	echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}"  >> ${S}/Rules.make
+
+	# Build the cmem kernel module
+	# We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass	
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS	
+	cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem
+
+	oe_runmake clean
+	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
+           KERNEL_SRC=${STAGING_KERNEL_DIR}    \
+           KERNEL_VERSION=${KERNEL_VERSION}    \
+           CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+           AR="${KERNEL_AR}"
+}
+
+
+do_install() {
+		install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
+		cp ${S}/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+FILES_ti-cmemk-module = "${sysconfdir} /lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/cmemk.ko"
+
+pkg_postinst_ti-cmemk-module () {
+		if [ -n "$D" ]; then        
+                exit 1
+        fi
+        depmod -a
+        update-modules || true
+}
+
+pkg_postrm_ti-cmemk-module () {
+        update-modules || true
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}" 
diff --git a/packages/dsplink/codec-engine_2.21.bb b/packages/dsplink/codec-engine_2.21.bb
index b300256a3a..7c81704604 100644
--- a/packages/dsplink/codec-engine_2.21.bb
+++ b/packages/dsplink/codec-engine_2.21.bb
@@ -1,3 +1,7 @@
+require dsplink.inc
+require lpm.inc
+require cmemk.inc
+
 DESCRIPTION = "Codec Engine for TI ARM/DSP processors"
 
 DEPENDS = "virtual/kernel perl-native"
@@ -6,19 +10,18 @@ RDEPENDS = "update-modules"
 inherit module
 
 # tconf from xdctools dislikes '.' in pwd :/
-PR = "r1"
+PR = "r2"
 PV = "221"
 
 # Get CE tarball from TI website, place in sources and calculate
 # md5sum
 # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html
 
-SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz \
+SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \
            file://Makefile.dsplink \
-           file://cmemk-fix-class-device-api.diff;patch=1 \
 "
 
-S = "${WORKDIR}/codec_engine_2_21_00_06"
+S = "${WORKDIR}/codec_engine_2_21"
 
 require ti-paths.inc
 
@@ -26,72 +29,8 @@ export DSPLINK="${S}/cetools/packages/dsplink"
 
 PARALLEL_MAKE = ""
 
-do_configure () {
-	# Run perl script to create appropriate makefiles (v1.60 and up)
-	perl ${S}/cetools/packages/dsplink/config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX  --gppos=${GPPOS} --comps=ponslrm
-}
-
-do_compile() {
-    unset DISPLAY
-    sed -i -e s:armv7a:armv7-a:g make/Linux/omap3530_2.6.mk || true
-
-    # export various settings to override the defaults in the makefiles
-    export DSP_BASE_CGTOOLS=${TITOOLSDIR}/${TICGTOOLSDIR}
-    export DSP_BASE_BIOS=${TITOOLSDIR}/${TIBIOSDIR}
-    export DSP_BASE_RTDX=${TITOOLSDIR}/${TIBIOSDIR}/packages/ti/rtdx
-    export GPPTOOL_DIR=${CROSS_DIR}
-    export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
-    export LINK_INSTALL_DIR=${DSPLINK}
-    export VARIANT=${DSPLINKSOC}
-    export PLATFORM=${DSPLINKPLATFORM}
-    export BASE_TOOLCHAIN=${CROSS_DIR}
-    export BASE_CGTOOLS=${BASE_TOOLCHAIN}/bin
-    # 'OSINC_PLATFORM' is used in both the dsp and gpp sides...
-    export OSINC_PLATFORM1=${CROSS_DIR}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include
-    export OSINC_TARGET=${BASE_TOOLCHAIN}/target/usr/include
-
-    # 'ARCHIVER' is being used in the dsp side of the build as well as gpp
-    export ARCHIVER_AR=${TARGET_PREFIX}ar
-    export BASE_SABIOS=${DSP_BASE_BIOS}
-   
-    make -e -f ${WORKDIR}/Makefile.dsplink
-
-	echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make		
-	echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make
-	echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}"  >> ${S}/Rules.make
-
-	# Build the cmem kernel module
-	# We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass	
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS	
-	cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem
-
-	oe_runmake clean
-	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-           KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
-           CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-           AR="${KERNEL_AR}" 
-
-	# Build the DSP power manager kernel module
-	cd ${S}/cetools/packages/ti/bios/power
-
-	# Unpack all kernel sources for the DSP power manager module
-	for dsp in $(ls | grep bld | awk -F, '{print $2}' | awk -F_ '{print $1}') ; do
-		if ! [ -e $dsp ] ; then tar xf ti_bios_power,${dsp}_bld.tar ; fi
-	done		
-	
-	cd ${DSPPOWERSOC}/lpm
-
-    unset LDFLAGS CFLAGS
-    make   KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-           KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-           KERNEL_DIR=${STAGING_KERNEL_DIR}   \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
-           TOOL_PREFIX=${TARGET_PREFIX} \
-           DSPLINK_REPO=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ \
-           CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-           AR="${KERNEL_AR}"
-
+# the include files on top define do_compile for the submodules 
+do_compile_append() {
 	cd ${S}/examples
 	# export some more variable to point to external TI tools
 	# information is duplicated between the js and make based tools
diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 9955d4d038..30d1ca3165 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -23,6 +23,7 @@ PARALLEL_MAKE = ""
 do_compile () {
 	unset DISPLAY
 	sed -i -e s:armv7a:armv7-a:g make/Linux/omap3530_2.6.mk || true
+    sed -i -e s:armv7a:armv7-a:g cetools/packages/dsplink/make/Linux/omap3530_2.6.mk || true 
 
 	# export various settings to override the defaults in the makefiles	
 	export DSP_BASE_CGTOOLS=${TITOOLSDIR}/${TICGTOOLSDIR}
diff --git a/packages/dsplink/lpm.inc b/packages/dsplink/lpm.inc
new file mode 100644
index 0000000000..211ffd3766
--- /dev/null
+++ b/packages/dsplink/lpm.inc
@@ -0,0 +1,61 @@
+DESCRIPTION = "Codec Engine for TI ARM/DSP processors - power module"
+
+DEPENDS = "virtual/kernel perl-native dsplink"
+RDEPENDS = "update-modules"
+
+inherit module
+
+require ti-paths.inc
+
+PARALLEL_MAKE = ""
+
+do_compile_append() {
+	echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make		
+	echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make
+	echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}"  >> ${S}/Rules.make
+
+	# Build the DSP power manager kernel module
+	cd ${S}/cetools/packages/ti/bios/power
+
+	# Unpack all kernel sources for the DSP power manager module
+	for dsp in $(ls | grep bld | awk -F, '{print $2}' | awk -F_ '{print $1}') ; do
+		if ! [ -e $dsp ] ; then tar xf ti_bios_power,${dsp}_bld.tar ; fi
+	done		
+	
+	cd ${DSPPOWERSOC}/lpm
+
+	unset LDFLAGS CFLAGS	
+	make   KERNEL_PATH=${STAGING_KERNEL_DIR}   \
+           KERNEL_SRC=${STAGING_KERNEL_DIR}    \
+           KERNEL_DIR=${STAGING_KERNEL_DIR}   \
+           KERNEL_VERSION=${KERNEL_VERSION}    \
+           TOOL_PREFIX=${TARGET_PREFIX} \
+           DSPLINK_REPO=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ \
+           CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+           AR="${KERNEL_AR}"
+}
+
+
+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
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+FILES_ti-lpm-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*lpm*ko"
+
+pkg_postinst_ti-lpm-module () {
+        if [ -n "$D" ]; then
+                exit 1
+        fi
+        depmod -a
+        update-modules || true
+}
+
+pkg_postrm_ti-lpm-module () {
+        update-modules || true
+}
+
+
+PACKAGE_ARCH = "${MACHINE_ARCH}" 
diff --git a/packages/dsplink/ti-cmemk-module_2.21.bb b/packages/dsplink/ti-cmemk-module_2.21.bb
index 4261b140d2..0e9f733c8b 100644
--- a/packages/dsplink/ti-cmemk-module_2.21.bb
+++ b/packages/dsplink/ti-cmemk-module_2.21.bb
@@ -1,70 +1,15 @@
-DESCRIPTION = "Codec Engine for TI ARM/DSP processors - cmemk module"
-
-DEPENDS = "virtual/kernel perl-native"
-RDEPENDS = "update-modules"
-
-inherit module
-
 # tconf from xdctools dislikes '.' in pwd :/
-PR = "r1"
+PR = "r2"
 PV = "221"
 
 # Get CE tarball from TI website, place in sources and calculate
 # md5sum
 # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html
 
-SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz \
+SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \
            file://Makefile.dsplink \
-           file://cmemk-fix-class-device-api.diff;patch=1 \
 "
 
-S = "${WORKDIR}/codec_engine_2_21_00_06"
-
-require ti-paths.inc
-
-export DSPLINK="${S}/cetools/packages/dsplink"
-
-PARALLEL_MAKE = ""
-
-
-do_compile() {
-	echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make		
-	echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make
-	echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}"  >> ${S}/Rules.make
-
-	# Build the cmem kernel module
-	# We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass	
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS	
-	cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem
-
-	oe_runmake clean
-	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-           KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
-           CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-           AR="${KERNEL_AR}"
-}
-
-
-do_install() {
-		install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
-		cp ${S}/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-FILES_ti-cmemk-module = "${sysconfdir} /lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/cmemk.ko"
-
-pkg_postinst_ti-cmemk-module () {
-		if [ -n "$D" ]; then        
-                exit 1
-        fi
-        depmod -a
-        update-modules || true
-}
-
-pkg_postrm_ti-cmemk-module () {
-        update-modules || true
-}
+S = "${WORKDIR}/codec_engine_2_21"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}" 
+require cmemk.inc
diff --git a/packages/dsplink/ti-lpm-module_2.21.bb b/packages/dsplink/ti-lpm-module_2.21.bb
index 50e58666bd..9a9791894d 100644
--- a/packages/dsplink/ti-lpm-module_2.21.bb
+++ b/packages/dsplink/ti-lpm-module_2.21.bb
@@ -1,75 +1,15 @@
-DESCRIPTION = "Codec Engine for TI ARM/DSP processors - power module"
-
-DEPENDS = "virtual/kernel perl-native dsplink"
-RDEPENDS = "update-modules"
-
-inherit module
-
 # tconf from xdctools dislikes '.' in pwd :/
-PR = "r1"
+PR = "r2"
 PV = "221"
 
 # Get CE tarball from TI website, place in sources and calculate
 # md5sum
 # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html
 
-SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz \
+SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \
            file://Makefile.dsplink \
           "
 
-S = "${WORKDIR}/codec_engine_2_21_00_06"
-
-require ti-paths.inc
-
-PARALLEL_MAKE = ""
-
-do_compile() {
-	echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make		
-	echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make
-	echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}"  >> ${S}/Rules.make
-
-	# Build the DSP power manager kernel module
-	cd ${S}/cetools/packages/ti/bios/power
-
-	# Unpack all kernel sources for the DSP power manager module
-	for dsp in $(ls | grep bld | awk -F, '{print $2}' | awk -F_ '{print $1}') ; do
-		if ! [ -e $dsp ] ; then tar xf ti_bios_power,${dsp}_bld.tar ; fi
-	done		
-	
-	cd ${DSPPOWERSOC}/lpm
-
-	unset LDFLAGS CFLAGS	
-	make   KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-           KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-           KERNEL_DIR=${STAGING_KER