imx-test: Don't install clocks.sh in MX6 as it uses 3.10 kernel

Kernel 3.10 uses the common clock framework, so the clock tree
information can be retrieved from the standard /sys/kernel/debug
location, which means we don't really need a custom clocks.sh script
for the 3.10 kernel.

You just don't need to install it if you use a recent kernel that
deploys the common clock tree framework (like it is the case for MX6
running 3.10).

Change-Id: Ief01c62025faa2927a226f9cd670e52dabb304be
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

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 c03e86561db70398806fda0aad2ec89fb8198e4c..78e14d8700508e37265a7b5c5fc856fd65f4a764 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
+++ b/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
@@ -18,8 +18,7 @@ PLATFORM_mx6sl = "IMX6S"
 PLATFORM_mx53 = "IMX53"
 PLATFORM_mx51 = "IMX51"
 
-SRC_URI = "${FSL_MIRROR}/imx-test-${PV}.tar.gz \
-           file://clocks.sh"
+SRC_URI = "${FSL_MIRROR}/imx-test-${PV}.tar.gz"
 
 inherit module-base
 
@@ -48,8 +47,10 @@ do_compile() {
 do_install() {
         install -d ${D}/unit_tests
         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 ${WORKDIR}/clocks.sh ]; then
+                install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
+        fi
 }
 
 FILES_${PN} += "/unit_tests"

diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_11.09.01.bb b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_11.09.01.bb
index 81df1896bf196bb9c9ccfbb78f81418234837f61..54a03f7536c0b42b83094d55cdd5b25d329e02c8 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_11.09.01.bb
+++ b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_11.09.01.bb
@@ -6,6 +6,8 @@ COMPATIBLE_MACHINE = "(mx5)"
 
 SRC_URI += "file://0001-ENGR00158471-fix-ipu-unit-test-application-missing-i.patch \
             file://0002-ENGR00170223-vpu-Fix-encoder-with-rotation-90-or-270.patch \
-            file://0003-ENGR00162747-fix-asrc-sample-rate-convert-issue.patch"
+            file://0003-ENGR00162747-fix-asrc-sample-rate-convert-issue.patch \
+            file://clocks.sh"
+
 SRC_URI[md5sum] = "5512dc0340cb71087c78f13bb6710ee0"
 SRC_URI[sha256sum] = "b788ac9c787b665c49596726e0095cef9ad835be4c616d2454543ae5f41a81af"

diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_2.6.35.3-1.1.0.bb b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_2.6.35.3-1.1.0.bb
index 33febf8447ef125c36195791c75cb3daa06ed997..26262762c9aa4e1d9706efbdd64d4f3f0464bad7 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_2.6.35.3-1.1.0.bb
+++ b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_2.6.35.3-1.1.0.bb
@@ -5,6 +5,8 @@ DEPENDS = "virtual/kernel"
 PR = "${INC_PR}.0"
 PE = "1"
 
+SRC_URI += " file://clocks.sh"
+
 SRC_URI[md5sum] = "e30d557aea2ef3cc5840a3cfc81364bc"
 SRC_URI[sha256sum] = "ce7dc16bc2e7e56d9394d8d899a4cdd73e416f8cec4d4a8acec946c8922028bf"
 

diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.10.17-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.10.17-1.0.0.bb
index b4362b85c457ecea1d3550ca7235b4c2532c30ce..80f4049c0fd53bb9a36ad08827c24e51fb4902a6 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.10.17-1.0.0.bb
+++ b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.10.17-1.0.0.bb
@@ -3,8 +3,7 @@
 include imx-test.inc
 
 # FIXME: Drop 'beta' suffix for GA release
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}_beta.tar.gz \
-           file://clocks.sh"
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}_beta.tar.gz"
 S="${WORKDIR}/${PN}-${PV}_beta"
 
 PE = "1"