* [meta-fsl-arm PATCH v2 2/6] image_types_fsl: Use explit task dependency to boost build
2014-03-07 14:52 [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release Otavio Salvador
@ 2014-03-07 14:52 ` Otavio Salvador
2014-03-07 14:58 ` Mario Domenech Goulart
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release Otavio Salvador
` (4 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Otavio Salvador @ 2014-03-07 14:52 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
Instead of depending of all tasks of recipes, we should depend on the
required task so we can start building the rootfs earlier in the build
process and earn some build time gain.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2: None
classes/image_types_fsl.bbclass | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 47e8338..39ceb7a 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -12,7 +12,9 @@ UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}"
#
# IMX Bootlets Linux bootstream
-IMAGE_DEPENDS_linux.sb = "elftosb-native imx-bootlets virtual/kernel"
+IMAGE_DEPENDS_linux.sb = "elftosb-native:do_populate_sysroot \
+ imx-bootlets:do_deploy \
+ virtual/kernel:do_deploy"
IMAGE_LINK_NAME_linux.sb = ""
IMAGE_CMD_linux.sb () {
kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`"
@@ -37,7 +39,10 @@ IMAGE_CMD_linux.sb () {
}
# IMX Bootlets barebox bootstream
-IMAGE_DEPENDS_barebox.mxsboot-sdcard = "elftosb-native u-boot-mxsboot-native imx-bootlets barebox"
+IMAGE_DEPENDS_barebox.mxsboot-sdcard = "elftosb-native:do_populate_sysroot \
+ u-boot-mxsboot-native:do_populate_sysroot \
+ imx-bootlets:do_deploy \
+ barebox:do_deploy"
IMAGE_CMD_barebox.mxsboot-sdcard () {
barebox_bd_file=imx-bootlets-barebox_ivt.bd-${MACHINE}
@@ -49,7 +54,8 @@ IMAGE_CMD_barebox.mxsboot-sdcard () {
# U-Boot mxsboot generation to SD-Card
UBOOT_SUFFIX_SDCARD_mxs ?= "mxsboot-sdcard"
-IMAGE_DEPENDS_uboot.mxsboot-sdcard = "u-boot-mxsboot-native u-boot"
+IMAGE_DEPENDS_uboot.mxsboot-sdcard = "u-boot-mxsboot-native:do_populate_sysroot \
+ u-boot:do_deploy"
IMAGE_CMD_uboot.mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard"
@@ -65,8 +71,10 @@ BAREBOX_ENV_SPACE ?= "512"
# Set alignment to 4MB [in KiB]
IMAGE_ROOTFS_ALIGNMENT = "4096"
-IMAGE_DEPENDS_sdcard = "parted-native dosfstools-native mtools-native \
- virtual/kernel ${IMAGE_BOOTLOADER}"
+IMAGE_DEPENDS_sdcard = "parted-native:do_populate_sysroot \
+ dosfstools-native:do_populate_sysroot \
+ mtools-native:do_populate_sysroot \
+ virtual/kernel:do_deploy ${IMAGE_BOOTLOADER}:do_deploy"
SDCARD = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sdcard"
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release
2014-03-07 14:52 [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release Otavio Salvador
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 2/6] image_types_fsl: Use explit task dependency to boost build Otavio Salvador
@ 2014-03-07 14:52 ` Otavio Salvador
2014-03-10 14:14 ` Daiane Angolini
2014-03-10 20:28 ` John Weber
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 4/6] amd-gpu-x11-bin: Add pkgconfig files for EGL and OpenGL ES 2 Otavio Salvador
` (3 subsequent siblings)
5 siblings, 2 replies; 18+ messages in thread
From: Otavio Salvador @ 2014-03-07 14:52 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
This updates U-Boot to a v2014.01 based release. It includes following
patches on top of prestine v2014.01 tag:
3fc5045 wandboard: add Future Eletronics 7" WVGA LCD extension board
5aebc94 mx6sl: Adjust fdt_addr to avoid address overlapping
95a98c2 mx6sabresd: Use mmcblk0 for CONFIG_MMCROOT
cd0b4d9 MX6: Add SION flag to ENET_REF_CLK PAD
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2: None
...boot-fslc-mxsboot_2013.10.bb => u-boot-fslc-mxsboot_2014.01.bb} | 6 +++---
recipes-bsp/u-boot/u-boot-fslc_2013.10.bb | 7 -------
recipes-bsp/u-boot/u-boot-fslc_2014.01.bb | 7 +++++++
3 files changed, 10 insertions(+), 10 deletions(-)
rename recipes-bsp/u-boot/{u-boot-fslc-mxsboot_2013.10.bb => u-boot-fslc-mxsboot_2014.01.bb} (87%)
delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb
similarity index 87%
rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
rename to recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb
index 3009ddf..2c0848d 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb
@@ -5,10 +5,10 @@ SECTION = "bootloader"
DEPENDS = "openssl"
PROVIDES = "u-boot-mxsboot"
-PV = "v2013.10"
+PV = "v2014.01"
-SRCREV = "079e214888279518ce061c71238a74a0c3db2c28"
-SRCBRANCH = "patches-2013.10"
+SRCREV = "bce40d36187be1d9165a9a6b9549c4989dcc48ed"
+SRCBRANCH = "patches-2014.01"
SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
deleted file mode 100644
index e7f100d..0000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include u-boot-fslc.inc
-
-PV = "v2013.10"
-
-SRCBRANCH = "patches-2013.10"
-
-SRCREV = "31d023bf8f15e6407557f5273c35c6ee3466a77f"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
new file mode 100644
index 0000000..ec0ab00
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
@@ -0,0 +1,7 @@
+include u-boot-fslc.inc
+
+PV = "v2014.01"
+
+SRCBRANCH = "patches-2014.01"
+
+SRCREV = "bce40d36187be1d9165a9a6b9549c4989dcc48ed"
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release Otavio Salvador
@ 2014-03-10 14:14 ` Daiane Angolini
2014-03-10 20:28 ` John Weber
1 sibling, 0 replies; 18+ messages in thread
From: Daiane Angolini @ 2014-03-10 14:14 UTC (permalink / raw)
To: Otavio Salvador; +Cc: meta-freescale Mailing List
On Fri, Mar 7, 2014 at 11:52 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> This updates U-Boot to a v2014.01 based release. It includes following
> patches on top of prestine v2014.01 tag:
>
> 3fc5045 wandboard: add Future Eletronics 7" WVGA LCD extension board
> 5aebc94 mx6sl: Adjust fdt_addr to avoid address overlapping
> 95a98c2 mx6sabresd: Use mmcblk0 for CONFIG_MMCROOT
> cd0b4d9 MX6: Add SION flag to ENET_REF_CLK PAD
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>
> Changes in v2: None
I tested if for
imx53qsb
imx28evk
imx6qsabresd
**U-Boot 2014.01 (Mar 10 2014 - 09:02:44)
**Board: MX53 LOCO
**
**U-Boot 2014.01 (Mar 07 2014 - 17:12:59)
**CPU: Freescale i.MX28 rev1.2 at 454 MHz
**
**U-Boot 2014.01 (Mar 10 2014 - 09:10:12)
**CPU: Freescale i.MX6Q rev1.2 at 792 MHz
And realized the log for imx53qsb differs from other boards =P
I'm OK to push/merge
Daiane
>
> ...boot-fslc-mxsboot_2013.10.bb => u-boot-fslc-mxsboot_2014.01.bb} | 6 +++---
> recipes-bsp/u-boot/u-boot-fslc_2013.10.bb | 7 -------
> recipes-bsp/u-boot/u-boot-fslc_2014.01.bb | 7 +++++++
> 3 files changed, 10 insertions(+), 10 deletions(-)
> rename recipes-bsp/u-boot/{u-boot-fslc-mxsboot_2013.10.bb => u-boot-fslc-mxsboot_2014.01.bb} (87%)
> delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
> create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
>
> diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb
> similarity index 87%
> rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
> rename to recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb
> index 3009ddf..2c0848d 100644
> --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
> +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb
> @@ -5,10 +5,10 @@ SECTION = "bootloader"
> DEPENDS = "openssl"
> PROVIDES = "u-boot-mxsboot"
>
> -PV = "v2013.10"
> +PV = "v2014.01"
>
> -SRCREV = "079e214888279518ce061c71238a74a0c3db2c28"
> -SRCBRANCH = "patches-2013.10"
> +SRCREV = "bce40d36187be1d9165a9a6b9549c4989dcc48ed"
> +SRCBRANCH = "patches-2014.01"
> SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}"
>
> S = "${WORKDIR}/git"
> diff --git a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
> deleted file mode 100644
> index e7f100d..0000000
> --- a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -include u-boot-fslc.inc
> -
> -PV = "v2013.10"
> -
> -SRCBRANCH = "patches-2013.10"
> -
> -SRCREV = "31d023bf8f15e6407557f5273c35c6ee3466a77f"
> diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
> new file mode 100644
> index 0000000..ec0ab00
> --- /dev/null
> +++ b/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
> @@ -0,0 +1,7 @@
> +include u-boot-fslc.inc
> +
> +PV = "v2014.01"
> +
> +SRCBRANCH = "patches-2014.01"
> +
> +SRCREV = "bce40d36187be1d9165a9a6b9549c4989dcc48ed"
> --
> 1.9.0
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release Otavio Salvador
2014-03-10 14:14 ` Daiane Angolini
@ 2014-03-10 20:28 ` John Weber
2014-03-10 20:35 ` Fabio Estevam
2014-03-11 13:47 ` Otavio Salvador
1 sibling, 2 replies; 18+ messages in thread
From: John Weber @ 2014-03-10 20:28 UTC (permalink / raw)
To: meta-freescale
[-- Attachment #1: Type: text/html, Size: 17720 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release
2014-03-10 20:28 ` John Weber
@ 2014-03-10 20:35 ` Fabio Estevam
2014-03-11 13:49 ` Otavio Salvador
2014-03-11 13:47 ` Otavio Salvador
1 sibling, 1 reply; 18+ messages in thread
From: Fabio Estevam @ 2014-03-10 20:35 UTC (permalink / raw)
To: John Weber; +Cc: meta-freescale@yoctoproject.org
On Mon, Mar 10, 2014 at 5:28 PM, John Weber <rjohnweber@gmail.com> wrote:
> Hi Otavio,
>
>
> On 3/7/14, 8:52 AM, Otavio Salvador wrote:
>
> This updates U-Boot to a v2014.01 based release. It includes following
> patches on top of prestine v2014.01 tag:
>
> 3fc5045 wandboard: add Future Eletronics 7" WVGA LCD extension board
I remember I reported issues with this patch when it was posted to the
U-boot list, so I am not sure why it was applied here.
> I've done a top-level check on this on wandboard-solo. It boots, which is
> good. But, I'm getting these i2c failure messages, which I believe to be
> due to a lack of an attached Future display panel:
The pristine U-boot 2014.01 does not contain i2c support for Wandboard...
>
> U-Boot 2014.01 (Mar 10 2014 - 14:49:56)
So Yocto should not tag it as 2014.01 since there are patches added on
top of 2014.01.
Regards,
Fabio Estevam
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release
2014-03-10 20:35 ` Fabio Estevam
@ 2014-03-11 13:49 ` Otavio Salvador
2014-03-11 15:02 ` Fabio Estevam
0 siblings, 1 reply; 18+ messages in thread
From: Otavio Salvador @ 2014-03-11 13:49 UTC (permalink / raw)
To: Fabio Estevam; +Cc: meta-freescale@yoctoproject.org
On Mon, Mar 10, 2014 at 5:35 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Mon, Mar 10, 2014 at 5:28 PM, John Weber <rjohnweber@gmail.com> wrote:
>> Hi Otavio,
>>
>>
>> On 3/7/14, 8:52 AM, Otavio Salvador wrote:
>>
>> This updates U-Boot to a v2014.01 based release. It includes following
>> patches on top of prestine v2014.01 tag:
>>
>> 3fc5045 wandboard: add Future Eletronics 7" WVGA LCD extension board
>
> I remember I reported issues with this patch when it was posted to the
> U-boot list, so I am not sure why it was applied here.
I might be missed it; I don't recall seeing it. Anyway I will work on this.
>> I've done a top-level check on this on wandboard-solo. It boots, which is
>> good. But, I'm getting these i2c failure messages, which I believe to be
>> due to a lack of an attached Future display panel:
>
> The pristine U-boot 2014.01 does not contain i2c support for Wandboard...
That's why the recipe is called u-boot-fslc.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release
2014-03-11 13:49 ` Otavio Salvador
@ 2014-03-11 15:02 ` Fabio Estevam
2014-03-11 15:06 ` Otavio Salvador
0 siblings, 1 reply; 18+ messages in thread
From: Fabio Estevam @ 2014-03-11 15:02 UTC (permalink / raw)
To: Otavio Salvador; +Cc: meta-freescale@yoctoproject.org
Hi Otavio,
On Tue, Mar 11, 2014 at 10:49 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
>> The pristine U-boot 2014.01 does not contain i2c support for Wandboard...
>
> That's why the recipe is called u-boot-fslc.
Then we shouldn't read "U-boot 2014.01".
If we are helping someone with an issue and ask the person to post the
log and we read "U-boot 2014.01" then we understand that they are
using the pure mainline version of U-boot 2014.01.
However, in this case there are are patches added on top of 2014.01,
so the tag should be somewhat different to reflect that extra patches
were added and avoid confusion.
Regards,
Fabio Estevam
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release
2014-03-11 15:02 ` Fabio Estevam
@ 2014-03-11 15:06 ` Otavio Salvador
0 siblings, 0 replies; 18+ messages in thread
From: Otavio Salvador @ 2014-03-11 15:06 UTC (permalink / raw)
To: Fabio Estevam; +Cc: meta-freescale@yoctoproject.org
On Tue, Mar 11, 2014 at 12:02 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Tue, Mar 11, 2014 at 10:49 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>
>>> The pristine U-boot 2014.01 does not contain i2c support for Wandboard...
>>
>> That's why the recipe is called u-boot-fslc.
>
> Then we shouldn't read "U-boot 2014.01".
>
> If we are helping someone with an issue and ask the person to post the
> log and we read "U-boot 2014.01" then we understand that they are
> using the pure mainline version of U-boot 2014.01.
>
> However, in this case there are are patches added on top of 2014.01,
> so the tag should be somewhat different to reflect that extra patches
> were added and avoid confusion.
I will see if LOCALVERSION can be used for it. In any case I will work
on the Wandboard fix before sending it again.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release
2014-03-10 20:28 ` John Weber
2014-03-10 20:35 ` Fabio Estevam
@ 2014-03-11 13:47 ` Otavio Salvador
1 sibling, 0 replies; 18+ messages in thread
From: Otavio Salvador @ 2014-03-11 13:47 UTC (permalink / raw)
To: John Weber; +Cc: meta-freescale@yoctoproject.org
Hello John,
On Mon, Mar 10, 2014 at 5:28 PM, John Weber <rjohnweber@gmail.com> wrote:
...
> *** Warning - bad CRC, using default environment
>
> wait_for_sr_state: failed sr=81 cr=a0 state=2020
> i2c_init_transfer: failed for chip 0x10 retry=0
> wait_for_sr_state: failed sr=81 cr=a0 state=2020
> i2c_init_transfer: failed for chip 0x10 retry=1
> wait_for_sr_state: failed sr=81 cr=a0 state=2020
> i2c_init_transfer: failed for chip 0x10 retry=2
> i2c_init_transfer: give up i2c_regs=021a0000
> No panel detected: default to HDMI
> Display: HDMI (1024x768)
...
> i2c_init_transfer: failed for chip 0x10 retry=0
> wait_for_sr_state: failed sr=81 cr=a0 state=2020
> i2c_init_transfer: failed for chip 0x10 retry=1
> wait_for_sr_state: failed sr=81 cr=a0 state=2020
> i2c_init_transfer: failed for chip 0x10 retry=2
> i2c_init_transfer: give up i2c_regs=021a0000
I will look at it and try to fix it.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 18+ messages in thread
* [meta-fsl-arm PATCH v2 4/6] amd-gpu-x11-bin: Add pkgconfig files for EGL and OpenGL ES 2
2014-03-07 14:52 [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release Otavio Salvador
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 2/6] image_types_fsl: Use explit task dependency to boost build Otavio Salvador
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 3/6] u-boot-fslc: Update to v2014.01 based release Otavio Salvador
@ 2014-03-07 14:52 ` Otavio Salvador
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 5/6] qtbase: Disable eglfs build for i.MX6 SoCs using X11 Otavio Salvador
` (2 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Otavio Salvador @ 2014-03-07 14:52 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
The pkgconfig files are need for some applications which use it to
check for library avaiability. The culprit which triggered it was the
addition of glmark2 into the test image, thus causing a build failure
in our autobuilder.
The build has been tested in X11 and Framebuffer backends.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- new patch
recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc | 8 ++++++++
recipes-graphics/amd-gpu-x11-bin/files/egl.pc | 11 +++++++++++
recipes-graphics/amd-gpu-x11-bin/files/glesv2.pc | 11 +++++++++++
3 files changed, 30 insertions(+)
create mode 100644 recipes-graphics/amd-gpu-x11-bin/files/egl.pc
create mode 100644 recipes-graphics/amd-gpu-x11-bin/files/glesv2.pc
diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
index 3ff5d4b..02a4f21 100644
--- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
@@ -1,4 +1,5 @@
# Copyright (C) 2011, 2012, 2013 Freescale
+# Copyright (C) 2011-2014 O.S. Systems Software LTDA.
# Released under the MIT license (see COPYING.MIT for the terms)
LICENSE = "Proprietary"
@@ -10,6 +11,8 @@ LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd7696
PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2"
SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
+ file://egl.pc \
+ file://glesv2.pc \
file://fix-linux-build-check.patch"
inherit fsl-eula-unpack
@@ -43,6 +46,11 @@ do_install () {
# FIXME: Remove unkown files
rm -r ${D}${libdir}/libcsi.a \
${D}${libdir}/libres.a
+
+ # FIXME: Add pkgconfig files
+ install -d ${D}${libdir}/pkgconfig
+ install -m 644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig
+ install -m 644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig
}
PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \
diff --git a/recipes-graphics/amd-gpu-x11-bin/files/egl.pc b/recipes-graphics/amd-gpu-x11-bin/files/egl.pc
new file mode 100644
index 0000000..3d2ab5d
--- /dev/null
+++ b/recipes-graphics/amd-gpu-x11-bin/files/egl.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: egl
+Description: AMD EGL library
+Requires.private:
+Version: 8.0
+Libs: -L${libdir} -lEGL
+Cflags: -I${includedir}
diff --git a/recipes-graphics/amd-gpu-x11-bin/files/glesv2.pc b/recipes-graphics/amd-gpu-x11-bin/files/glesv2.pc
new file mode 100644
index 0000000..62e1cb6
--- /dev/null
+++ b/recipes-graphics/amd-gpu-x11-bin/files/glesv2.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: glesv2
+Description: AMD OpenGL ES 2.0 library
+Requires.private:
+Version: 8.0
+Libs: -L${libdir} -lGLESv2 -lEGL
+Cflags: -I${includedir}
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [meta-fsl-arm PATCH v2 5/6] qtbase: Disable eglfs build for i.MX6 SoCs using X11
2014-03-07 14:52 [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release Otavio Salvador
` (2 preceding siblings ...)
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 4/6] amd-gpu-x11-bin: Add pkgconfig files for EGL and OpenGL ES 2 Otavio Salvador
@ 2014-03-07 14:52 ` Otavio Salvador
2014-03-07 15:01 ` Eric Bénard
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 6/6] cogl-1.0: Rename bbappend to generic version Otavio Salvador
2014-03-10 14:12 ` [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release Daiane Angolini
5 siblings, 1 reply; 18+ messages in thread
From: Otavio Salvador @ 2014-03-07 14:52 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
The eglfs hooks require the Framebuffer API calls which are not
available when building for X11; to allow qtbase to build for X11 we
must disable eglfs support due this restriction.
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- new patch
.../qt5/qtbase/Force_egl_visual_ID_33.patch | 23 ++++++++++++++++++++++
qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 5 +++++
2 files changed, 28 insertions(+)
create mode 100644 qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
diff --git a/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch b/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
new file mode 100644
index 0000000..b0be292
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
@@ -0,0 +1,23 @@
+Workaround EGL initialization failure due visual mismatch
+
+Error:
+
+Warning: EGL suggested using X Visual ID 33 (RGB888) for EGL config 28 (RGB444), but this is incompatable
+Unable to find an X11 visual which matches EGL config 28
+Could not initialize EGL
+Aborted
+
+Upstream-Status: Inappropriate [workaround]
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+diff -Naur qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
+--- qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:08:42.163895341 -0800
++++ qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:09:37.207893799 -0800
+@@ -180,5 +180,5 @@
+ }
+
+ qWarning("Unable to find an X11 visual which matches EGL config %d", configId);
+- return (VisualID)0;
++ return (VisualID)33;
+ }
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 310d7f7..c1df764 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -1,5 +1,9 @@
# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://Force_egl_visual_ID_33.patch"
+
HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
PACKAGECONFIG_GL_mx5 = "gles2"
@@ -7,6 +11,7 @@ PACKAGECONFIG_append_mx5 = " tslib icu examples"
PACKAGECONFIG_GL_mx6 = "gles2"
PACKAGECONFIG_append_mx6 = " tslib icu examples"
+QT_CONFIG_FLAGS_append_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', '', d)}"
do_configure_prepend_mx5() {
sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [meta-fsl-arm PATCH v2 5/6] qtbase: Disable eglfs build for i.MX6 SoCs using X11
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 5/6] qtbase: Disable eglfs build for i.MX6 SoCs using X11 Otavio Salvador
@ 2014-03-07 15:01 ` Eric Bénard
2014-03-07 15:25 ` Otavio Salvador
0 siblings, 1 reply; 18+ messages in thread
From: Eric Bénard @ 2014-03-07 15:01 UTC (permalink / raw)
To: Otavio Salvador; +Cc: meta-freescale Mailing List
Le Fri, 7 Mar 2014 11:52:44 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :
> The eglfs hooks require the Framebuffer API calls which are not
> available when building for X11; to allow qtbase to build for X11 we
> must disable eglfs support due this restriction.
>
> Signed-off-by: Lauren Post <lauren.post@freescale.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>
> Changes in v2:
> - new patch
>
> .../qt5/qtbase/Force_egl_visual_ID_33.patch | 23 ++++++++++++++++++++++
> qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 5 +++++
> 2 files changed, 28 insertions(+)
> create mode 100644 qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
>
> diff --git a/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch b/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
> new file mode 100644
> index 0000000..b0be292
> --- /dev/null
> +++ b/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
> @@ -0,0 +1,23 @@
> +Workaround EGL initialization failure due visual mismatch
> +
> +Error:
> +
> +Warning: EGL suggested using X Visual ID 33 (RGB888) for EGL config 28 (RGB444), but this is incompatable
> +Unable to find an X11 visual which matches EGL config 28
> +Could not initialize EGL
> +Aborted
> +
> +Upstream-Status: Inappropriate [workaround]
> +
> +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> +
> +diff -Naur qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
> +--- qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:08:42.163895341 -0800
> ++++ qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:09:37.207893799 -0800
> +@@ -180,5 +180,5 @@
> + }
> +
> + qWarning("Unable to find an X11 visual which matches EGL config %d", configId);
> +- return (VisualID)0;
> ++ return (VisualID)33;
> + }
> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> index 310d7f7..c1df764 100644
> --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> @@ -1,5 +1,9 @@
> # Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
>
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +SRC_URI += "file://Force_egl_visual_ID_33.patch"
> +
this change is not documented anywhere in the commit log.
Eric
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [meta-fsl-arm PATCH v2 5/6] qtbase: Disable eglfs build for i.MX6 SoCs using X11
2014-03-07 15:01 ` Eric Bénard
@ 2014-03-07 15:25 ` Otavio Salvador
0 siblings, 0 replies; 18+ messages in thread
From: Otavio Salvador @ 2014-03-07 15:25 UTC (permalink / raw)
To: Eric Bénard; +Cc: meta-freescale Mailing List
Hello Eric,
On Fri, Mar 7, 2014 at 12:01 PM, Eric Bénard <eric@eukrea.com> wrote:
> Le Fri, 7 Mar 2014 11:52:44 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
>> The eglfs hooks require the Framebuffer API calls which are not
>> available when building for X11; to allow qtbase to build for X11 we
>> must disable eglfs support due this restriction.
>>
>> Signed-off-by: Lauren Post <lauren.post@freescale.com>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>
>> Changes in v2:
>> - new patch
>>
>> .../qt5/qtbase/Force_egl_visual_ID_33.patch | 23 ++++++++++++++++++++++
>> qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 5 +++++
>> 2 files changed, 28 insertions(+)
>> create mode 100644 qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
>>
>> diff --git a/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch b/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
>> new file mode 100644
>> index 0000000..b0be292
>> --- /dev/null
>> +++ b/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
>> @@ -0,0 +1,23 @@
>> +Workaround EGL initialization failure due visual mismatch
>> +
>> +Error:
>> +
>> +Warning: EGL suggested using X Visual ID 33 (RGB888) for EGL config 28 (RGB444), but this is incompatable
>> +Unable to find an X11 visual which matches EGL config 28
>> +Could not initialize EGL
>> +Aborted
>> +
>> +Upstream-Status: Inappropriate [workaround]
>> +
>> +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> +
>> +diff -Naur qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
>> +--- qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:08:42.163895341 -0800
>> ++++ qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:09:37.207893799 -0800
>> +@@ -180,5 +180,5 @@
>> + }
>> +
>> + qWarning("Unable to find an X11 visual which matches EGL config %d", configId);
>> +- return (VisualID)0;
>> ++ return (VisualID)33;
>> + }
>> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>> index 310d7f7..c1df764 100644
>> --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>> @@ -1,5 +1,9 @@
>> # Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
>>
>> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>> +
>> +SRC_URI += "file://Force_egl_visual_ID_33.patch"
>> +
> this change is not documented anywhere in the commit log.
Good catch.
New changelog is:
--
qtbase: Disable eglfs build for i.MX6 SoCs using X11
The eglfs hooks require the Framebuffer API calls which are not
available when building for X11; to allow qtbase to build for X11 we
must disable eglfs support due this restriction.
A patch to workaround EGL initialization failure due visual mismatch
has been included as well, forcing Visual ID 33.
--
I will send a v3 but please advice if you think it is good now.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 18+ messages in thread
* [meta-fsl-arm PATCH v2 6/6] cogl-1.0: Rename bbappend to generic version
2014-03-07 14:52 [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release Otavio Salvador
` (3 preceding siblings ...)
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 5/6] qtbase: Disable eglfs build for i.MX6 SoCs using X11 Otavio Salvador
@ 2014-03-07 14:52 ` Otavio Salvador
2014-03-10 14:12 ` [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release Daiane Angolini
5 siblings, 0 replies; 18+ messages in thread
From: Otavio Salvador @ 2014-03-07 14:52 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
This allow for version independant matching so we don't need to bump
it every time OE-Core updates.
This also removes the -DUSE_API_FB for X11 case as X11 cannot use it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- new patch
recipes-graphics/cogl/{cogl-1.0_1.16.0.bbappend => cogl-1.0_%.bbappend} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename recipes-graphics/cogl/{cogl-1.0_1.16.0.bbappend => cogl-1.0_%.bbappend} (97%)
diff --git a/recipes-graphics/cogl/cogl-1.0_1.16.0.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend
similarity index 97%
rename from recipes-graphics/cogl/cogl-1.0_1.16.0.bbappend
rename to recipes-graphics/cogl/cogl-1.0_%.bbappend
index 9de6ceb..40633c4 100644
--- a/recipes-graphics/cogl/cogl-1.0_1.16.0.bbappend
+++ b/recipes-graphics/cogl/cogl-1.0_%.bbappend
@@ -1,6 +1,6 @@
# Provide the need flags and backend settings to work with Vivante GPU
CFLAGS_append_mx6 = " -DLINUX \
- ${@base_contains('DISTRO_FEATURES', 'x11', '-DEGL_API_FB', \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '', \
base_contains('DISTRO_FEATURES', 'wayland', \
'-DEGL_API_WL', '', d), d)}"
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release
2014-03-07 14:52 [meta-fsl-arm PATCH v2 1/6] linux-fslc (3.12): Update to 3.12.13 stable release Otavio Salvador
` (4 preceding siblings ...)
2014-03-07 14:52 ` [meta-fsl-arm PATCH v2 6/6] cogl-1.0: Rename bbappend to generic version Otavio Salvador
@ 2014-03-10 14:12 ` Daiane Angolini
5 siblings, 0 replies; 18+ messages in thread
From: Daiane Angolini @ 2014-03-10 14:12 UTC (permalink / raw)
To: Otavio Salvador; +Cc: meta-freescale Mailing List
On Fri, Mar 7, 2014 at 11:52 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> This is the 3.12.13 stable release
>
> * tag 'v3.12.13': (1211 commits)
> Linux 3.12.13
> EDAC: Correct workqueue setup path
> EDAC: Poll timeout cannot be zero, p2
> drivers/edac/edac_mc_sysfs.c: poll timeout cannot be zero
> genirq: Add missing irq_to_desc export for CONFIG_SPARSE_IRQ=n
> target: Fix free-after-use regression in PR unregister
> ring-buffer: Fix first commit on sub-buffer having non-zero delta
> power: max17040: Fix NULL pointer dereference when there is no platform_data
> time: Fix overflow when HZ is smaller than 60
> i2c: mv64xxx: refactor message start to ensure proper initialization
> md/raid5: Fix CPU hotplug callback registration
> md/raid1: restore ability for check and repair to fix read errors.
> tick: Clear broadcast pending bit when switching to oneshot
> KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio()
> IB/qib: Add missing serdes init sequence
> compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
> ACPI / hotplug / PCI: Relax the checking of _STA return values
> block: add cond_resched() to potentially long running ioctl discard loop
> block: Fix nr_vecs for inline integrity vectors
> block: __elv_next_request() shouldn't call into the elevator if bypassing
> ...
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>
> Changes in v2: None
I tested it for:
imx53qsb
imx28evk
imx6qsabresd
**Linux imx53qsb 3.12.13-fslc+g1cd7a83 #1 SMP Fri Mar 7 17:46:14 BRT
2014 armv7l GNU/Linux
**Linux imx28evk 3.12.13-fslc+g1cd7a83 #1 Fri Mar 7 16:31:05 BRT 2014
armv5tejl GNU/Linux
**Linux imx6qsabresd 3.12.13-fslc+g1cd7a83 #1 SMP Fri Mar 7 18:44:10
BRT 2014 armv7l GNU/Linux
I'm OK to push
Daiane
>
> recipes-kernel/linux/linux-fslc_3.12.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-kernel/linux/linux-fslc_3.12.bb b/recipes-kernel/linux/linux-fslc_3.12.bb
> index bb98939..6ad5ac9 100644
> --- a/recipes-kernel/linux/linux-fslc_3.12.bb
> +++ b/recipes-kernel/linux/linux-fslc_3.12.bb
> @@ -6,6 +6,6 @@ include linux-fslc.inc
> PV = "3.12+git${SRCPV}"
>
> SRCBRANCH = "patches-3.12"
> -SRCREV = "9ab58339c5e84c34df82f8a2f68b8b033b9bd03f"
> +SRCREV = "1cd7a834347a9dcb326d14cf00cb9921f235968a"
>
> COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
> --
> 1.9.0
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
^ permalink raw reply [flat|nested] 18+ messages in thread