[meta-fsl-arm PATCH 1/6] u-boot-fslc: Update to patches-2013.04's 20130420 snapshot

[meta-fsl-arm PATCH 1/6] u-boot-fslc: Update to patches-2013.04's 20130420 snapshot

[Otavio Salvador]

This features the following updates:

 * Fixes i.MX51EVK board support
 * Update to 2013.04 final release

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-fslc_2013.04.bb    | 2 +-
 recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-fslc_2013.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2013.04.bb
index e1dc1d2..27a21c0 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2013.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2013.04.bb
@@ -10,7 +10,7 @@ PROVIDES += "u-boot"
 
 PV = "v2013.04"
 
-SRCREV = "6675aaab17b944867aa13164e50ecdab0884b8b8"
+SRCREV = "c06acf00d675a7e9ea82434cd6cfeb81c6f44bef"
 SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb b/recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb
index 74b7cc2..7b5bd34 100644
--- a/recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb
+++ b/recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb
@@ -5,7 +5,7 @@ SECTION = "bootloader"
 
 PV = "v2013.04"
 
-SRCREV = "6675aaab17b944867aa13164e50ecdab0884b8b8"
+SRCREV = "c06acf00d675a7e9ea82434cd6cfeb81c6f44bef"
 SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
 
 S = "${WORKDIR}/git"
-- 
1.8.1

[meta-fsl-arm PATCH 2/6] linux-fslc: Update to patches-3.8's snapshot from 20130420

[Otavio Salvador]

This features the following updates:

 * Merge of 3.8.8 stable release
 * Fix for i.MX233 OlinuXino MMC boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-fslc_3.8.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-fslc_3.8.bb b/recipes-kernel/linux/linux-fslc_3.8.bb
index 68fa8e1..de39564 100644
--- a/recipes-kernel/linux/linux-fslc_3.8.bb
+++ b/recipes-kernel/linux/linux-fslc_3.8.bb
@@ -4,9 +4,9 @@
 include linux-fslc.inc
 
 PV = "3.8+git${SRCPV}"
-PR = "r5"
+PR = "r6"
 
 # patches-3.8
-SRCREV = "9674b8d96fca62bc47be48fd857591dcfca874b1"
+SRCREV = "7fd77a4db4dc59f98a7118fdbbf02d82b03de1de"
 
 COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
1.8.1

[meta-fsl-arm PATCH 3/6] xserver-xorg: Do not remove Xorg native DRI module

[Otavio Salvador]

The DRI support of Xorg is need to trigger the loading of Vivante
DRI. So we revert this change while we keep the removal of Xorg header
so we build against Vivante ones.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
index 02ecb6e..59a751b 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
@@ -19,8 +19,7 @@ do_install_append_mx6 () {
     # FIXME: This is a workaround to ensure we use Vivante DRI
     rm ${D}${includedir}/xorg/dri.h \
        ${D}${includedir}/xorg/sarea.h \
-       ${D}${includedir}/xorg/dristruct.h \
-       ${D}${libdir}/xorg/modules/extensions/libdri.so
+       ${D}${includedir}/xorg/dristruct.h
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.8.1

[meta-fsl-arm PATCH 4/6] xf86-dri-vivante: Add rdepends for GLX, DRI and DRI2 Xorg's extensions

[Otavio Salvador]

The Vivante DRI support requires GLX, DRI and DRI2 Xorg's extensions
to properly work, so we add them as explicit runtime dependencies to
avoid the removal of them by mistake.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb b/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
index 6e8f8db..09bba2d 100644
--- a/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
+++ b/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
@@ -40,7 +40,9 @@ FILES_${PN}-dev += "${includedir}/xorg/*.h"
 FILES_${PN} += " ${libdir}/xorg/modules/extensions/*.so"
 FILES_${PN}-dbg += " ${libdir}/xorg/modules/extensions/.debug"
 
-RDEPENDS_${PN} += "xserver-xorg-extension-glx"
+RDEPENDS_${PN} += "xserver-xorg-extension-glx \
+                   xserver-xorg-extension-dri \
+                   xserver-xorg-extension-dri2"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.1

[meta-fsl-arm PATCH 5/6] gpu-viv-bin-mx6q: Package DRI module

[Otavio Salvador]

The DRI module is dlopen by GLX code so we need to have it packaged.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 44f6fc9..97cebfd 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -1,4 +1,5 @@
-# Copyright (C) 2012 Freescale Semiconductor
+# Copyright (C) 2012-2013 Freescale Semiconductor
+# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "GPU driver and apps for imx6"
@@ -27,6 +28,7 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
 	libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \
 	libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \
 	libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \
+	libvivante-dri-mx6 \
 "
 
 USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}"
@@ -58,6 +60,7 @@ do_install () {
     cp -axr ${S}/opt ${D}
 
     if [ "${USE_X11}" = "yes" ]; then
+        cp -r ${S}/usr/lib/dri ${D}${libdir}
         find ${D}${libdir} -name '*-dfb.so' -exec rm '{}' ';'
         find ${D}${libdir} -name '*-fb.so' -exec rm '{}' ';'
     else
@@ -140,5 +143,7 @@ FILES_libvivante-mx6 = "${libdir}/libVIVANTE${SOLIBS}"
 FILES_libvivante-mx6-dev = "${libdir}/libVIVANTE${SOLIBSDEV}"
 FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}"
 
+FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.1

[meta-fsl-arm PATCH 6/6] xf86-video-imxfb-vivante: Add rdepends on libvivante-dri-mx6

[Otavio Salvador]

The driver try to dynamically load the DRI support code and it needs
to be available in rootfs for use in Xorg driver.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
index 22e8d6e..36f56f2 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
@@ -36,7 +36,10 @@ do_install_append () {
 	find ${D}${includedir} -type f -exec chmod 660 {} \;
 }
 
-RDEPENDS_${PN} += "xserver-xorg-module-exa mesa-driver-swrast xf86-dri-vivante"
+RDEPENDS_${PN} += "libvivante-dri-mx6 \
+                   xserver-xorg-module-exa \
+                   mesa-driver-swrast \
+                   xf86-dri-vivante"
 
 # Add the ABI dependency at package generation time, as otherwise bitbake will
 # attempt to find a provider for it (and fail) when it does the parse.
-- 
1.8.1

Re: [meta-fsl-arm PATCH 1/6] u-boot-fslc: Update to patches-2013.04's 20130420 snapshot

[Daiane Angolini]

On 04/22/2013 08:43 AM, Otavio Salvador wrote:
> This features the following updates:
>
>   * Fixes i.MX51EVK board support
>   * Update to 2013.04 final release

Finally it's the final release.

Could you, please, update the commit subject to reflect it's the final 
release of Uboot? (I mean, instead of being a 'snapshot'. I know 
everything is a snapshot, but i would like to have a more formal subject)


-- 
Daiane

Re: [meta-fsl-arm PATCH 2/6] linux-fslc: Update to patches-3.8's snapshot from 20130420

[Daiane Angolini]

On 04/22/2013 08:43 AM, Otavio Salvador wrote:
> This features the following updates:
>
>   * Merge of 3.8.8 stable release
>   * Fix for i.MX233 OlinuXino MMC boot
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   recipes-kernel/linux/linux-fslc_3.8.bb | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-kernel/linux/linux-fslc_3.8.bb b/recipes-kernel/linux/linux-fslc_3.8.bb
> index 68fa8e1..de39564 100644
> --- a/recipes-kernel/linux/linux-fslc_3.8.bb
> +++ b/recipes-kernel/linux/linux-fslc_3.8.bb
> @@ -4,9 +4,9 @@
>   include linux-fslc.inc
>
>   PV = "3.8+git${SRCPV}"
> -PR = "r5"
> +PR = "r6"

Why some recipes you bump PR and some other you do not?



>
>   # patches-3.8
> -SRCREV = "9674b8d96fca62bc47be48fd857591dcfca874b1"
> +SRCREV = "7fd77a4db4dc59f98a7118fdbbf02d82b03de1de"
>
>   COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"

Will you keep "mxs" as compatible machine? (instead of mx28 and mx23, I 
mean)

-- 
Daiane

Re: [meta-fsl-arm PATCH 2/6] linux-fslc: Update to patches-3.8's snapshot from 20130420

[Otavio Salvador]

On Mon, Apr 22, 2013 at 8:57 AM, Daiane Angolini
<daiane.angolini@freescale.com> wrote:
> On 04/22/2013 08:43 AM, Otavio Salvador wrote:
>>
>> This features the following updates:
>>
>>   * Merge of 3.8.8 stable release
>>   * Fix for i.MX233 OlinuXino MMC boot
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>   recipes-kernel/linux/linux-fslc_3.8.bb | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/recipes-kernel/linux/linux-fslc_3.8.bb
>> b/recipes-kernel/linux/linux-fslc_3.8.bb
>> index 68fa8e1..de39564 100644
>> --- a/recipes-kernel/linux/linux-fslc_3.8.bb
>> +++ b/recipes-kernel/linux/linux-fslc_3.8.bb
>> @@ -4,9 +4,9 @@
>>   include linux-fslc.inc
>>
>>   PV = "3.8+git${SRCPV}"
>> -PR = "r5"
>> +PR = "r6"
>
>
> Why some recipes you bump PR and some other you do not?

Auto pilot! :-) This PR bump can be removed.

>>   # patches-3.8
>> -SRCREV = "9674b8d96fca62bc47be48fd857591dcfca874b1"
>> +SRCREV = "7fd77a4db4dc59f98a7118fdbbf02d82b03de1de"
>>
>>   COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
>
>
> Will you keep "mxs" as compatible machine? (instead of mx28 and mx23, I
> mean)

This works for both so 'mxs' is the shortest variation of it. I see no
reason to replace 'mxs' to 'mx23:mx28' when the support is for both
SoCs.

What do you think?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm PATCH 1/6] u-boot-fslc: Update to patches-2013.04's 20130420 snapshot

[Otavio Salvador]

On Mon, Apr 22, 2013 at 8:55 AM, Daiane Angolini
<daiane.angolini@freescale.com> wrote:
> On 04/22/2013 08:43 AM, Otavio Salvador wrote:
>>
>> This features the following updates:
>>
>>   * Fixes i.MX51EVK board support
>>   * Update to 2013.04 final release
>
>
> Finally it's the final release.
>
> Could you, please, update the commit subject to reflect it's the final
> release of Uboot? (I mean, instead of being a 'snapshot'. I know everything
> is a snapshot, but i would like to have a more formal subject)

When I was writting the commit log I pondered about it and I choose to
not mention it in subject because it is not 2013.04 only but fixes on
top of it. One of changes merged is the final release.

What you think?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm PATCH 2/6] linux-fslc: Update to patches-3.8's snapshot from 20130420

[Daiane Angolini]

On 04/22/2013 09:01 AM, Otavio Salvador wrote:
> On Mon, Apr 22, 2013 at 8:57 AM, Daiane Angolini
> <daiane.angolini@freescale.com> wrote:
>> On 04/22/2013 08:43 AM, Otavio Salvador wrote:
>>>
>>> This features the following updates:
>>>
>>>    * Merge of 3.8.8 stable release
>>>    * Fix for i.MX233 OlinuXino MMC boot
>>>
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>> ---
>>>    recipes-kernel/linux/linux-fslc_3.8.bb | 4 ++--
>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/recipes-kernel/linux/linux-fslc_3.8.bb
>>> b/recipes-kernel/linux/linux-fslc_3.8.bb
>>> index 68fa8e1..de39564 100644
>>> --- a/recipes-kernel/linux/linux-fslc_3.8.bb
>>> +++ b/recipes-kernel/linux/linux-fslc_3.8.bb
>>> @@ -4,9 +4,9 @@
>>>    include linux-fslc.inc
>>>
>>>    PV = "3.8+git${SRCPV}"
>>> -PR = "r5"
>>> +PR = "r6"
>>
>>
>> Why some recipes you bump PR and some other you do not?
>
> Auto pilot! :-) This PR bump can be removed.
>
>>>    # patches-3.8
>>> -SRCREV = "9674b8d96fca62bc47be48fd857591dcfca874b1"
>>> +SRCREV = "7fd77a4db4dc59f98a7118fdbbf02d82b03de1de"
>>>
>>>    COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
>>
>>
>> Will you keep "mxs" as compatible machine? (instead of mx28 and mx23, I
>> mean)
>
> This works for both so 'mxs' is the shortest variation of it. I see no
> reason to replace 'mxs' to 'mx23:mx28' when the support is for both
> SoCs.
>
> What do you think?

I completely agree.

My intend was to make it clean and explicit for everyone.

-- 
Daiane

Re: [meta-fsl-arm PATCH 1/6] u-boot-fslc: Update to patches-2013.04's 20130420 snapshot

[Daiane Angolini]

On 04/22/2013 09:05 AM, Otavio Salvador wrote:
> On Mon, Apr 22, 2013 at 8:55 AM, Daiane Angolini
> <daiane.angolini@freescale.com> wrote:
>> On 04/22/2013 08:43 AM, Otavio Salvador wrote:
>>>
>>> This features the following updates:
>>>
>>>    * Fixes i.MX51EVK board support
>>>    * Update to 2013.04 final release
>>
>>
>> Finally it's the final release.
>>
>> Could you, please, update the commit subject to reflect it's the final
>> release of Uboot? (I mean, instead of being a 'snapshot'. I know everything
>> is a snapshot, but i would like to have a more formal subject)
>
> When I was writting the commit log I pondered about it and I choose to
> not mention it in subject because it is not 2013.04 only but fixes on
> top of it. One of changes merged is the final release.
>
> What you think?

Sincerely I don't know. I got confused because you update u-boot so much 
last weeks that I don't know what we have today.

But, when you update to the formal 2013.04 RELEASE (instead of release 
candidate), please, make everyone know it on subject/shortlog

-- 
Daiane