matrix: sync with OE .dev

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

6 files changed, 17 insertions, 23 deletions

diff --git a/recipes-bsp/ti/matrix-gui-common.inc b/recipes-bsp/ti/matrix-gui-common.inc
index b1c9fb80..6b61081b 100644
--- a/recipes-bsp/ti/matrix-gui-common.inc
+++ b/recipes-bsp/ti/matrix-gui-common.inc
@@ -4,11 +4,10 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=37;md5=a802a01a3a58f2ebb1e83c25f883f0c0"
 
 SECTION = "multimedia"
-PRIORITY = "optional"
 
-INC_PR = "r7"
+INC_PR = "r10"
 
-COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)"
+COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x|ti814x)"
 
 PLATFORM_dm365-evm = "dm365"
 PLATFORM_dm368-evm = "dm368"
@@ -16,8 +15,9 @@ PLATFORM_omapl138 = "omapl138"
 PLATFORM_omap3evm = "omap3530"
 PLATFORM_dm37x-evm = "dm3730"
 PLATFORM_am37x-evm = "am3715"
-PLATFORM_beagleboard = "am3715"
+PLATFORM_beagleboard = "beagleboard"
 PLATFORM_ti816x = "ti816x"
+PLATFORM_ti814x = "ti814x"
 PLATFORM_am180x-evm = "am180x"
 PLATFORM_am181x-evm = "am181x"
 PLATFORM_am3517-evm = "am3517"
@@ -38,6 +38,7 @@ do_install() {
     install -d ${D}/${datadir}/matrix/images
     install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
     install -m 0644 ${S}/images/*.svg ${D}/${datadir}/matrix/images/
+
 }
 
 FILES_${PN} += "${datadir}/matrix/*"
diff --git a/recipes-bsp/ti/matrix-gui-e.inc b/recipes-bsp/ti/matrix-gui-e.inc
index 9fdc6f6f..481f4f4e 100644
--- a/recipes-bsp/ti/matrix-gui-e.inc
+++ b/recipes-bsp/ti/matrix-gui-e.inc
@@ -4,11 +4,10 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=37;md5=a802a01a3a58f2ebb1e83c25f883f0c0"
 
 SECTION = "multimedia"
-PRIORITY = "optional"
 
-INC_PR = "r22"
+INC_PR = "r24"
 
-COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)"
+COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x|ti814x)"
 
 PLATFORM_dm365-evm = "dm365"
 PLATFORM_dm368-evm = "dm368"
@@ -16,8 +15,9 @@ PLATFORM_omapl138 = "omapl138"
 PLATFORM_omap3evm = "omap3530"
 PLATFORM_dm37x-evm = "dm3730"
 PLATFORM_am37x-evm = "am3715"
-PLATFORM_beagleboard = "am3715"
+PLATFORM_beagleboard = "beagleboard"
 PLATFORM_ti816x = "ti816x"
+PLATFORM_ti814x = "ti814x"
 PLATFORM_am180x-evm = "am180x"
 PLATFORM_am181x-evm = "am181x"
 PLATFORM_am3517-evm = "am3517"
diff --git a/recipes-bsp/ti/matrix-gui-e_1.3.bb b/recipes-bsp/ti/matrix-gui-e_1.3.bb
index e7254c9f..25a03d24 100644
--- a/recipes-bsp/ti/matrix-gui-e_1.3.bb
+++ b/recipes-bsp/ti/matrix-gui-e_1.3.bb
@@ -1,4 +1,4 @@
 require matrix-gui-e.inc
 
-SRCREV = "222"
+SRCREV = "275"
 PR = "${INC_PR}.0"
diff --git a/recipes-bsp/ti/matrix-gui.inc b/recipes-bsp/ti/matrix-gui.inc
index 1e544014..40494a95 100644
--- a/recipes-bsp/ti/matrix-gui.inc
+++ b/recipes-bsp/ti/matrix-gui.inc
@@ -4,11 +4,10 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=37;md5=a802a01a3a58f2ebb1e83c25f883f0c0"
 
 SECTION = "multimedia"
-PRIORITY = "optional"
 
-INC_PR = "r20"
+INC_PR = "r22"
 
-COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)"
+COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x|ti814x)"
 
 PLATFORM_dm365-evm = "dm365"
 PLATFORM_dm368-evm = "dm368"
@@ -16,8 +15,9 @@ PLATFORM_omapl138 = "omapl138"
 PLATFORM_omap3evm = "omap3530"
 PLATFORM_dm37x-evm = "dm3730"
 PLATFORM_am37x-evm = "am3715"
-PLATFORM_beagleboard = "am3715"
+PLATFORM_beagleboard = "beagleboard"
 PLATFORM_ti816x = "ti816x"
+PLATFORM_ti814x = "ti814x"
 PLATFORM_am180x-evm = "am180x"
 PLATFORM_am181x-evm = "am181x"
 PLATFORM_am3517-evm = "am3517"
diff --git a/recipes-bsp/ti/matrix-gui_1.3.bb b/recipes-bsp/ti/matrix-gui_1.3.bb
index cfdf47e8..483c6d67 100644
--- a/recipes-bsp/ti/matrix-gui_1.3.bb
+++ b/recipes-bsp/ti/matrix-gui_1.3.bb
@@ -1,4 +1,4 @@
 require matrix-gui.inc
 
-SRCREV = "222"
+SRCREV = "275"
 PR = "${INC_PR}.0"
diff --git a/recipes-bsp/ti/matrix-tui.inc b/recipes-bsp/ti/matrix-tui.inc
index 1ad8aa89..ef89f1fa 100644
--- a/recipes-bsp/ti/matrix-tui.inc
+++ b/recipes-bsp/ti/matrix-tui.inc
@@ -9,13 +9,6 @@ INC_PR = "r7"
 
 COMPATIBLE_MACHINE = "(omapl138|omap3)"
 
-PLATFORM_am37x-evm = "am3715"
-PLATFORM_beagleboard = "am3715"
-PLATFORM_am3517-evm = "am3517"
-PLATFORM_am180x-evm = "am180x"
-PLATFORM_am181x-evm = "am181x"
-PLATFORM_da850-omapl138-evm = "am180x"
-
 SRC_URI = "svn://gforge.ti.com/svn/matrix_tui/;module=trunk;proto=https;user=anonymous;pswd='' \
         file://init \
 "
@@ -28,7 +21,6 @@ S = "${WORKDIR}/trunk"
 #INITSCRIPT_PARAMS = "defaults 99"
 
 do_configure() {
-        sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:' makefile.init
         sed -i -e 's|LIBS :=|LIBS := ${LDFLAGS} |' Release/objects.mk
 }
 
@@ -39,11 +31,12 @@ do_compile() {
         export TUI_INCLUDE_PATH=${STAGING_INCDIR}
         export XML_INCLUDE_PATH=${STAGING_INCDIR}/libxml2
         export TUI_LIB_PATH=${STAGING_LIBDIR}
+        export PLATFORM=${MACHINE}
         make release
 }
 
 do_install() {
-        export PLATFORM=${PLATFORM}
+        export PLATFORM=${MACHINE}
         make DESTDIR=${D} install
         install -d ${D}${sysconfdir}/init.d/
         install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-tui