[meta-fsl-arm][for-daisy][PATCH 00/10] Proposed backports for Daisy

[meta-fsl-arm][for-daisy][PATCH 00/10] Proposed backports for Daisy

[Otavio Salvador]

I have collected some patches I think we can backport for Daisy. Those
are in use for a while and show no drawbacks.

Please report back if you think we ought to skip any of those changes.

Alexey Ignatov (2):
  image_types_fsl.bbclass: Add U-Boot NAND support for i.MX23/i.MX28
  imx28evk: Add U-Boot NAND image generation support

Carlos Rafael Giani (1):
  gstreamer1.0-plugins-imx: Update to version 0.9.7

Jacob Kroon (3):
  gpu-viv-bin-mx6q: Don't package wayland libraries in non-wayland
    builds
  gpu-viv-bin-mx6q: Fix file ownership in packages
  gpu-viv-bin-mx6q: Use symlink in libgl-mx6 package

Otavio Salvador (4):
  linux-imx (3.10.17): Update to 2a69800 revision
  linux-fslc (3.14): Update to cde0fbb revision
  linux-imx (2.6.35.3): Update to the b3912bb revision
  linux-fslc (3.14): Update to 6c6f90b revision

 classes/image_types_fsl.bbclass                           |  7 +++++++
 conf/machine/imx28evk.conf                                |  1 +
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc    | 15 +++++++++++----
 recipes-kernel/linux/linux-fslc_3.14.bb                   |  2 +-
 recipes-kernel/linux/linux-imx_2.6.35.3.bb                |  2 +-
 recipes-kernel/linux/linux-imx_3.10.17.bb                 |  2 +-
 ...ins-imx_0.9.6.bb => gstreamer1.0-plugins-imx_0.9.7.bb} |  2 +-
 7 files changed, 23 insertions(+), 8 deletions(-)
 rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-imx_0.9.6.bb => gstreamer1.0-plugins-imx_0.9.7.bb} (96%)

-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 01/10] image_types_fsl.bbclass: Add U-Boot NAND support for i.MX23/i.MX28

[Otavio Salvador]

From: Alexey Ignatov <lexszero@gmail.com>

This adds support to generate the U-Boot image for use with NAND
(uboot.mxsboot-nand) and allows for custom params to be given for
mxsboot using the MXSBOOT_NAND_ARGS variable which should be defined
in the machine definition file.

Signed-off-by: Alexey Ignatov <lexszero@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 classes/image_types_fsl.bbclass | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index dfa55e4..c0fa9b6 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -10,6 +10,7 @@ UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}"
 #
 # Handles i.MX mxs bootstream generation
 #
+MXSBOOT_NAND_ARGS ?= ""
 
 # IMX Bootlets Linux bootstream
 IMAGE_DEPENDS_linux.sb = "elftosb-native:do_populate_sysroot \
@@ -59,6 +60,12 @@ IMAGE_DEPENDS_uboot.mxsboot-sdcard = "u-boot-mxsboot-native:do_populate_sysroot
 IMAGE_CMD_uboot.mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
                                              ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard"
 
+IMAGE_DEPENDS_uboot.mxsboot-nand = "u-boot-mxsboot-native:do_populate_sysroot \
+                                      u-boot:do_deploy"
+IMAGE_CMD_uboot.mxsboot-nand = "mxsboot ${MXSBOOT_NAND_ARGS} nand \
+                                             ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
+                                             ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-nand"
+
 # Boot partition volume id
 BOOTDD_VOLUME_ID ?= "Boot ${MACHINE}"
 
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 02/10] imx28evk: Add U-Boot NAND image generation support

[Otavio Salvador]

From: Alexey Ignatov <lexszero@gmail.com>

This defines NAND parameters for u-boot.mxsboot-nand image creation
similar to those used for UBI image (for K9LBG08U0D-PCB chip):
- page size: 4 k
- OOB size: 218 bytes
- erase size: 512 k

Signed-off-by: Alexey Ignatov <lexszero@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/imx28evk.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index d4f1ad6..c25e54b 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -29,6 +29,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
 
 MKUBIFS_ARGS = "--min-io-size 4096 --leb-size 516096 --max-leb-cnt 8139"
 UBINIZE_ARGS = "--min-io-size 4096 --peb-size 524288 --sub-page-size 4096"
+MXSBOOT_NAND_ARGS = "-w 4096 -o 218 -e 524288"
 
 ## To determine parameters' values, run "ubiattach -m 6 /dev/ubi_ctrl"
 ## (assuming the rootfs device is /dev/mtd6).  Here's an example:
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 03/10] gstreamer1.0-plugins-imx: Update to version 0.9.7

[Otavio Salvador]

From: Carlos Rafael Giani <dv@pseudoterminal.org>

Changes:
- Support newer Vivante drivers, which use a different name for the
  direct textures extension
- Sync points for forced keyframes during encoding were missing
- Added checks for cases where physical memory allocators fail

Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...reamer1.0-plugins-imx_0.9.6.bb => gstreamer1.0-plugins-imx_0.9.7.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-imx_0.9.6.bb => gstreamer1.0-plugins-imx_0.9.7.bb} (96%)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.9.6.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.9.7.bb
similarity index 96%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.9.6.bb
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.9.7.bb
index 71d95f1..a3d982e 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.9.6.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.9.7.bb
@@ -6,7 +6,7 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base libfslvpuwrap virtual/kernel v
            virtual/libgles2 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
 
 SRCBRANCH ?= "master"
-SRCREV = "67ea62069fca79d65bf244e98ff568d39399fdaf"
+SRCREV = "c25d1089a3aa630cd50646fe46eb78787466a062"
 SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 04/10] linux-imx (3.10.17): Update to 2a69800 revision

[Otavio Salvador]

This includes the following updates to the 3.10.17-1.0.0-GA:

2a69800 ENGR00318392 ARM:imx6x: Save/restore SCU and some CP15
2a7bd41 ENGR00301078-2: ARM: dts: imx6sl-evk: add support for pfuze200 on imx6sl-evk
f0790e4 ENGR00301078-1: ARM: dts: imx6dl-sabresd: add support for pfuze200 on mx6dl-sabresd
d52df5f pfuze100-regulator: Fix of_node_get() parameter
ce1917e regulator: pfuze100: Use of_get_child_by_name
097577d regulator: pfuze100: Add PFUZE200 support to Kconfig and module description
dad7af3 regulator: pfuze100: Add terminate entry for [i2c|of]_device_id tables
792bf11 regulator: pfuze100: add pfuze200 support
df8c0fa regulator: pfuze100: Fix address of FABID
dd27604 ENGR00309838 ARM: imx6sl: gpc: add chip revision check for dispmix

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-imx_3.10.17.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-imx_3.10.17.bb b/recipes-kernel/linux/linux-imx_3.10.17.bb
index afa31e2..c643d26 100644
--- a/recipes-kernel/linux/linux-imx_3.10.17.bb
+++ b/recipes-kernel/linux/linux-imx_3.10.17.bb
@@ -11,7 +11,7 @@ require recipes-kernel/linux/linux-dtb.inc
 DEPENDS += "lzop-native bc-native"
 
 SRCBRANCH = "imx_3.10.17_1.0.0_ga"
-SRCREV = "232293e0abb46639e188ab9d8643f1dbf94534f6"
+SRCREV = "2a69800d94f182e975e4ed3ae2e64d30d35a3603"
 LOCALVERSION = "-1.0.0_ga"
 
 COMPATIBLE_MACHINE = "(mx6)"
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 05/10] linux-fslc (3.14): Update to cde0fbb revision

[Otavio Salvador]

This updates the 3.14-based kernel to the 3.14.11 release.

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

diff --git a/recipes-kernel/linux/linux-fslc_3.14.bb b/recipes-kernel/linux/linux-fslc_3.14.bb
index fb41d2d..bf3d5c9 100644
--- a/recipes-kernel/linux/linux-fslc_3.14.bb
+++ b/recipes-kernel/linux/linux-fslc_3.14.bb
@@ -12,6 +12,6 @@ include linux-fslc.inc
 PV = "3.14+git${SRCPV}"
 
 SRCBRANCH = "patches-3.14"
-SRCREV = "c34636a55713cace69f1f753f30da3d63fbf72ad"
+SRCREV = "cde0fbb3d22d463c482b7c8396cf0a5cbb961cec"
 
 COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 06/10] gpu-viv-bin-mx6q: Don't package wayland libraries in non-wayland builds

[Otavio Salvador]

From: Jacob Kroon <jacob.kroon@mikrodidakt.se>

Running

  readelf --dynamic libgc_wayland_protocol.so | grep NEEDED

shows that the library has a runtime dependency on libffi. Same thing
applies to libwayland-viv.so.

For non-wayland builds, where libffi may or may not be available during
package time, skip packaging them so that they don't cause unexpected
dependency changes in buildhistory.

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

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 4106848..0db37c3 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
@@ -174,6 +174,12 @@ do_install () {
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so
 
+    # skip packaging wayland libraries if no support is requested
+    if [ "${USE_WL}" = "no" ]; then
+        rm ${D}${libdir}/libgc_wayland_protocol.*
+        rm ${D}${libdir}/libwayland-viv.*
+    fi
+
     for backend in wl x11 fb dfb; do
         find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';'
     done
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 07/10] gpu-viv-bin-mx6q: Fix file ownership in packages

[Otavio Salvador]

From: Jacob Kroon <jacob.kroon@mikrodidakt.se>

The do_install() function is run under pseudo in order to create packages with
correct file-permissions. By issuing "cp -a" to install files, we leak
build user/group permissions into the packages, since the do_unpack() function
is executed as the regular build user. Replace it with -P, so that we at least
keep symlinks.

Also drop -x (--one-file-system) since it's not needed.

This was tested by comparing the output of "ls -lR --time-style=+ image/"
before and after the change.

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 0db37c3..ce71f9f 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
@@ -108,9 +108,9 @@ do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
 
-    cp -a ${S}/usr/lib/*.so* ${D}${libdir}
-    cp -axr ${S}/usr/include/* ${D}${includedir}
-    cp -axr ${S}/opt ${D}
+    cp -P ${S}/usr/lib/*.so* ${D}${libdir}
+    cp -r ${S}/usr/include/* ${D}${includedir}
+    cp -r ${S}/opt ${D}
 
     install -d ${D}${libdir}/pkgconfig
 
@@ -170,7 +170,7 @@ do_install () {
 
     # update libglesv2 as backend dependent
     rm -rf ${D}${libdir}/libGLESv2*
-    cp -a ${S}/usr/lib/libGLESv2-${backend}.so ${D}${libdir}/libGLESv2.so.2.0.0
+    cp ${S}/usr/lib/libGLESv2-${backend}.so ${D}${libdir}/libGLESv2.so.2.0.0
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so
 
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 08/10] gpu-viv-bin-mx6q: Use symlink in libgl-mx6 package

[Otavio Salvador]

From: Jacob Kroon <jacob.kroon@mikrodidakt.se>

The libgl-mx6 package had a duplicated libGL.so.1.
Force it into a symlink.

This was tested by comparing the output of "ls -lR --time-style=+ image/"
before and after the change.

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 1 +
 1 file changed, 1 insertion(+)

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 ce71f9f..2c383c4 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
@@ -161,6 +161,7 @@ do_install () {
     # and avoid rework in other packages, when possible
     mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0
     ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2
+    ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1
     ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so
     mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0
     ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 09/10] linux-imx (2.6.35.3): Update to the b3912bb revision

[Otavio Salvador]

This includes following updates:

b3912bb ENGR00285448 [MX28] SAIF: Out of Voltage in SAIF clock PINs
90ce77d ENGR00285446-3 [MX28] SAIF: Bit Shift in SAIF RX Data
1ea685a ENGR00285446-2 [MX28] SAIF: Bit Shift in SAIF RX Data
1ca8992 ENGR00285446-1 [MX28] SAIF: Bit Shift in SAIF RX Data
45fe172 mach-mx5/devices.c: Add PMU device

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-imx_2.6.35.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index be39179..bfc56b7 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -12,7 +12,7 @@ include linux-imx.inc
 COMPATIBLE_MACHINE = "(mx28|mx5)"
 
 # Revision of imx_2.6.35_maintain branch
-SRCREV = "903363ed80a113f2d1e3e96e508ecf128d9af323"
+SRCREV = "b3912bb8a4caf3ec50909135e88af959982c43ca"
 LOCALVERSION = "-maintain+yocto"
 SRCBRANCH = "imx_2.6.35_maintain"
 
-- 
2.1.0.rc1

[meta-fsl-arm][for-daisy][PATCH 10/10] linux-fslc (3.14): Update to 6c6f90b revision

[Otavio Salvador]

This updates the Linux 3.14-based branch to the 3.14.14 stable
release.

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

diff --git a/recipes-kernel/linux/linux-fslc_3.14.bb b/recipes-kernel/linux/linux-fslc_3.14.bb
index bf3d5c9..653d8f7 100644
--- a/recipes-kernel/linux/linux-fslc_3.14.bb
+++ b/recipes-kernel/linux/linux-fslc_3.14.bb
@@ -12,6 +12,6 @@ include linux-fslc.inc
 PV = "3.14+git${SRCPV}"
 
 SRCBRANCH = "patches-3.14"
-SRCREV = "cde0fbb3d22d463c482b7c8396cf0a5cbb961cec"
+SRCREV = "6c6f90b1cef3cf4586c175fee94d1e6c43c77666"
 
 COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
2.1.0.rc1