imx-test: Upgrade to 3.10.9-1.0.0

imx-test includes exclusion for imx6 solo lite for vpu test cases
and inclusion on epdc test cases

Previous patches on imx-test have been applied to imx-test package

Update to handle 3.10 kernel uapi directory which has the mxc headers

Change-Id: Ifc98af6ca1c035879dba0ccb94ade5e0b276db03
Signed-off-by: Lauren Post <lauren.post@freescale.com>

diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc b/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
index fb3745d887870a7503572657d77f531c0ac62499..052e3567d615c11c236c018c974c4d5d0d3eb53a 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
+++ b/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
@@ -1,25 +1,32 @@
 SUMMARY = "Test programs for IMX BSP"
 DESCRIPTION = "Unit tests for the IMX BSP"
 SECTION = "base"
-DEPENDS = "virtual/kernel imx-lib"
-DEPENDS_append_mx5 = " imx-vpu"
+DEPENDS_mx5   = "virtual/kernel imx-lib imx-vpu"
+DEPENDS_mx6q  = "virtual/kernel imx-lib imx-vpu"
+DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu"
+DEPENDS_mx6s  = "virtual/kernel imx-lib imx-vpu"
+DEPENDS_mx6sl = "virtual/kernel imx-lib"
+
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
 INC_PR = "r7"
 
 PLATFORM_mx6 = "IMX6Q"
+PLATFORM_mx6sl = "IMX6S"
 PLATFORM_mx53 = "IMX53"
 PLATFORM_mx51 = "IMX51"
 
 SRC_URI = "${FSL_MIRROR}/imx-test-${PV}.tar.gz \
-           file://clocks.sh \
-           file://mxc_x11_test-exclude-IMX-5-6-platforms.patch"
+           file://clocks.sh"
 
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 INCLUDE_DIR="-I${STAGING_INCDIR} \
+             -I${S}/include \
+             -I${STAGING_KERNEL_DIR}/include/uapi \
              -I${STAGING_KERNEL_DIR}/include \
+             -I${STAGING_KERNEL_DIR}/arch/arm/include \
              -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
              -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include"
 
@@ -34,9 +41,6 @@ do_install() {
         install -m 755 test-utils.sh ${D}/unit_tests/test-utils.sh
         install -m 0755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
         install -m 755 ${S}/platform/${PLATFORM}/* ${D}/unit_tests/
-        if [ -e ${S}/test/mxc_vpu_test/mxc-vpu-test.out ]; then
-            install -m 755 ${S}/test/mxc_vpu_test/configs/* ${D}/unit_tests/
-        fi
 }
 
 FILES_${PN} += "/unit_tests"

diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.10.9-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.10.9-1.0.0.bb
new file mode 100644 (file)
index 0000000..5b0722f
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.10.9-1.0.0.bb
@@ -0,0 +1,10 @@
+# Copyright (C) 2013 Freescale Semiconductor
+
+include imx-test.inc
+
+PE = "1"
+
+SRC_URI[md5sum] = "518ce3fba668a09993d53b3b0df85944"
+SRC_URI[sha256sum] = "576ffd963cc8ea82e6f17e55ac467448286df014408b23a59ecf9d8072955d7a"
+
+COMPATIBLE_MACHINE = "(mx6)"

diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.5.7-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.5.7-1.0.0.bb
deleted file mode 100644 (file)
index f676bd0..0000000
--- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.5.7-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013 Freescale Semiconductor
-
-require imx-test.inc
-
-PE = "1"
-
-SRC_URI[md5sum] = "98788357991eb5b3af289d8084199b48"
-SRC_URI[sha256sum] = "eefb26ed66d4ff53cf3467182e8916c02efa847e69321c90d5b6ef65bf1ee665"
-
-COMPATIBLE_MACHINE = "(mx6)"