Patchwork [meta-fsl-arm,03/12] imx-test: Stop installing clocks.sh in MX6

login
register
mail settings
Submitter Otavio Salvador
Date Jan. 18, 2014, 2:41 a.m.
Message ID <1390012875-16143-4-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/65127/
State Superseded
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Jan. 18, 2014, 2:41 a.m.
Change-Id: Ief01c62025faa2927a226f9cd670e52dabb304be
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/imx-test/imx-test.inc               | 7 ++++---
 recipes-bsp/imx-test/imx-test_11.09.01.bb       | 4 +++-
 recipes-bsp/imx-test/imx-test_2.6.35.3-1.1.0.bb | 2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)
Fabio Estevam - Jan. 18, 2014, 3:05 p.m.
On Sat, Jan 18, 2014 at 12:41 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> Change-Id: Ief01c62025faa2927a226f9cd670e52dabb304be
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Would be nice to explain the motivation for removing it.

Regards,

Fabio Estevam
Otavio Salvador - Jan. 18, 2014, 3:48 p.m.
Hello Fabio,

On Sat, Jan 18, 2014 at 1:05 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Sat, Jan 18, 2014 at 12:41 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> Change-Id: Ief01c62025faa2927a226f9cd670e52dabb304be
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> Would be nice to explain the motivation for removing it.

This has been split from the release layer changes and it has no
detailed information about why it does not work. When I asked I've
been told that the script does not work for MX6 but without further
details.

I didn't debug why it does not work.
Fabio Estevam - Jan. 18, 2014, 4:10 p.m.
On Sat, Jan 18, 2014 at 1:48 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> Hello Fabio,
>
> On Sat, Jan 18, 2014 at 1:05 PM, Fabio Estevam <festevam@gmail.com> wrote:
>> On Sat, Jan 18, 2014 at 12:41 AM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>>> Change-Id: Ief01c62025faa2927a226f9cd670e52dabb304be
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>
>> Would be nice to explain the motivation for removing it.
>
> This has been split from the release layer changes and it has no
> detailed information about why it does not work. When I asked I've
> been told that the script does not work for MX6 but without further
> details.

clocks.sh is a script used to dump the entire clock tree on old FSL
kernels, such as 2.6.35.

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.

So the subject "imx-test: Stop installing clocks.sh in MX6" is not
correct, because the reason you don't install clocks.sh is not related
to the SoC itself. 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).

Regards,

Fabio Estevam
Otavio Salvador - Jan. 18, 2014, 7:44 p.m.
Hello Fabio,

On Sat, Jan 18, 2014 at 2:10 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Sat, Jan 18, 2014 at 1:48 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> Hello Fabio,
>>
>> On Sat, Jan 18, 2014 at 1:05 PM, Fabio Estevam <festevam@gmail.com> wrote:
>>> On Sat, Jan 18, 2014 at 12:41 AM, Otavio Salvador
>>> <otavio@ossystems.com.br> wrote:
>>>> Change-Id: Ief01c62025faa2927a226f9cd670e52dabb304be
>>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>>
>>> Would be nice to explain the motivation for removing it.
>>
>> This has been split from the release layer changes and it has no
>> detailed information about why it does not work. When I asked I've
>> been told that the script does not work for MX6 but without further
>> details.
>
> clocks.sh is a script used to dump the entire clock tree on old FSL
> kernels, such as 2.6.35.
>
> 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.
>
> So the subject "imx-test: Stop installing clocks.sh in MX6" is not
> correct, because the reason you don't install clocks.sh is not related
> to the SoC itself. 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).

I reworked this commit.

commit 043ac6f87075cce5dbde2e1520e2b8ae2f34ac1c
Author: Otavio Salvador <otavio@ossystems.com.br>
Date:   Fri Jan 17 16:04:59 2014 -0200

    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>

and I will put it /after/ we move to 3.10.

Do you agree?
Fabio Estevam - Jan. 18, 2014, 7:46 p.m.
On Sat, Jan 18, 2014 at 5:44 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:

> I reworked this commit.
>
> commit 043ac6f87075cce5dbde2e1520e2b8ae2f34ac1c
> Author: Otavio Salvador <otavio@ossystems.com.br>
> Date:   Fri Jan 17 16:04:59 2014 -0200
>
>     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>
>
> and I will put it /after/ we move to 3.10.
>
> Do you agree?

Looks good.

Regards,

Fabio Estevam

Patch

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index a98313c..0e5ae86 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/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
 
@@ -47,8 +46,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/recipes-bsp/imx-test/imx-test_11.09.01.bb b/recipes-bsp/imx-test/imx-test_11.09.01.bb
index 81df189..54a03f7 100644
--- a/recipes-bsp/imx-test/imx-test_11.09.01.bb
+++ b/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/recipes-bsp/imx-test/imx-test_2.6.35.3-1.1.0.bb b/recipes-bsp/imx-test/imx-test_2.6.35.3-1.1.0.bb
index 33febf8..2626276 100644
--- a/recipes-bsp/imx-test/imx-test_2.6.35.3-1.1.0.bb
+++ b/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"