dmai: fix build and update omap3 srcrev to 642

Signed-off-by: Enrico Butera <ebutera@users.berlios.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

4 files changed, 93 insertions, 2 deletions

diff --git a/recipes-ti/dmai/ti-dmai.inc b/recipes-ti/dmai/ti-dmai.inc
index c3d45a7b..a84f303a 100644
--- a/recipes-ti/dmai/ti-dmai.inc
+++ b/recipes-ti/dmai/ti-dmai.inc
@@ -114,7 +114,8 @@ do_compile () {
             BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\
             LINUXLIBS_INSTALL_DIR="${STAGING_DIR_TARGET}/usr" \
             USER_XDC_PATH="${USER_XDC_PATH}" \
-            CROSS_COMPILE="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" \
+            CROSS_COMPILE="${TOOLCHAIN_PATH}/${TARGET_PREFIX}" \
+            CSTOOL_DIR="${TOOLCHAIN_PATH}" \
             VERBOSE="true" \
             XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \
             LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
diff --git a/recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff b/recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff
new file mode 100644
index 00000000..54963542
--- /dev/null
+++ b/recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff
@@ -0,0 +1,48 @@
+Index: dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h
+===================================================================
+--- dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h   (revisione 642)
++++ dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h   (copia locale)
+@@ -34,7 +34,6 @@
+ #ifndef ti_sdo_dai_linux_priv__VideoBuf_h_
+ #define ti_sdo_dai_linux_priv__VideoBuf_h_
+ 
+-#include <linux/videodev.h>
+ #include <linux/videodev2.h>
+ 
+ #include <ti/sdo/dmai/BufferGfx.h>
+Index: dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c
+===================================================================
+--- dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c        (revisione 642)
++++ dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c        (copia locale)
+@@ -38,7 +38,6 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+-#include <linux/videodev.h>
+ #include <linux/videodev2.h>
+ 
+ #include <xdc/std.h>
+Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c
+===================================================================
+--- dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c  (revisione 642)
++++ dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c  (copia locale)
+@@ -40,7 +40,6 @@
+ #include <sys/mman.h>
+ #include <sys/ioctl.h>
+ #include <asm/types.h>
+-#include <linux/videodev.h>
+ #include <linux/videodev2.h>
+ 
+ #include <xdc/std.h>
+Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
+===================================================================
+--- dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c     (revisione 642)
++++ dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c     (copia locale)
+@@ -38,7 +38,6 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+-#include <linux/videodev.h>
+ #include <linux/videodev2.h>
+ 
+ #include <xdc/std.h>
diff --git a/recipes-ti/dmai/ti-dmai/r642-fix-config-bld.diff b/recipes-ti/dmai/ti-dmai/r642-fix-config-bld.diff
new file mode 100644
index 00000000..06ffbec4
--- /dev/null
+++ b/recipes-ti/dmai/ti-dmai/r642-fix-config-bld.diff
@@ -0,0 +1,36 @@
+Index: dmai/packages/config.bld
+===================================================================
+--- dmai/packages/config.bld    (revisione 642)
++++ dmai/packages/config.bld    (copia locale)
+@@ -44,29 +44,9 @@
+ C6X.rootDir = codegen;
+ C6X.platform = xdcplat;
+ 
+-/* User passes in $(CROSS_COMPILE) where $(CROSS_COMPILE)gcc is their compiler
+-   Then the TOOLDIR and LONGNAME are derived based on a regex of CROSS_COMPILE
+-*/
+-var crosscompile = "" + java.lang.System.getenv("CROSS_COMPILE");
++var tooldir = "" + java.lang.System.getenv("CSTOOL_DIR");
++var longName = "" + java.lang.System.getenv("MVTOOL_PREFIX") + "gcc";
+ 
+-var tooldir = "";
+-var longName = "";
+-
+-/* Search CROSS_COMPILE for bin/ If only 1 bin/ is found, set the tooldir to
+-   the path prior to bin/ and the prefix to "bin/" + remainder of path,
+-   else leave the tooldir as "" and set the LONGNAME to the full CROSS_COMPILE
+-   path
+-*/
+-var regex = new RegExp("bin/");
+-var find = crosscompile.split( regex );
+-
+-if (find[0]!=crosscompile && find.length==2) {
+-    tooldir = find[0];
+-    longName = "bin/" + find[1] + "gcc";
+-} else {
+-    longName = crosscompile + "gcc";
+-}
+-
+ /* location of the GCC Arm9 tools */
+ var GCArmv5T = xdc.useModule('gnu.targets.arm.GCArmv5T');
+ GCArmv5T.LONGNAME = longName;
diff --git a/recipes-ti/dmai/ti-dmai_svn.bb b/recipes-ti/dmai/ti-dmai_svn.bb
index 374acce7..cae4c1f7 100644
--- a/recipes-ti/dmai/ti-dmai_svn.bb
+++ b/recipes-ti/dmai/ti-dmai_svn.bb
@@ -7,6 +7,8 @@ DEFAULT_PREFERENCE = "-1"
 
 PV = "2_10_00_01+svnr${SRCPV}"
 
+LIC_FILES_CHKSUM = "file://dmai_${PV}_License.html;md5=3302f728a5a42f97cabc26a54d7fa607"
+
 # This package has high dependence on kernel, use kernel PR as base and append a local version
 PR = "${MACHINE_KERNEL_PR}"
 PR_append = "n"
@@ -22,10 +24,14 @@ DMAIBRANCH           ?= "<UNDEFINED_DMAIBRANCH>"
 
 SRCREV_dm6446         = "482"
 SRCREV_dm6467         = "441"
-SRCREV_omap3          = "570"
+SRCREV_omap3          = "642"
 SRCREV_dm355          = "424"
 SRCREV_dm365          = "570"
 SRCREV_omapl137       = "482"
 SRCREV_omapl138       = "570"
 SRCREV               ?= "<UNDEFINED_SRCREV>"
 
+SRC_URI_append = " file://omap3530-r642-remove-include-videodev.diff \
+                   file://r642-fix-config-bld.diff \
+                 "
+