[meta-fsl-arm][PATCH 00/12] Upgrade to i.MX 6UL7D Beta

[meta-fsl-arm][PATCH 00/12] Upgrade to i.MX 6UL7D Beta

[Lauren Post]

Upgrade for 3.14.38-6UL7D beta release introducing the
i.MX 6UltraLite EVK.

Upgrade to 2015.04 U-BOot
Upgrade BSP components imx-vpu, imx-lib, imx-test and imx-kobs
Changes to build issues with i.MX 6 without a GPU

Lauren Post (12):
  linux-imx: Add changes for 3.14.38-6UL7D_beta release
  imx7dsabresd: Add sim imx7d-sdb-sim device trees
  imx7dsabresd: Add touch imx7d-sdb-touch device tree
  imx6ulevk: Create i.MX 6 UltraLite EVK machine
  imx-base: Changes for i.MX 6Ultra Lite
  u-boot-imx: Upgrade to 2015.04 version
  imx-kobs: Upgrade to 5.1 version
  imx-lib: Upgrade to 5.1 and add i.MX 6UltraLite support
  imx-test: Upgrade to 5.1 version and add 6UL support
  imx-vpu: Upgrade to 5.4.31 version
  xserver-xf86-config: Add i.MX6UL xorg.conf
  imx-gpu-viv: Change compatible machine to mx6 with GPU

 conf/machine/imx6ulevk.conf                        |   22 ++++++++++++++++++++
 conf/machine/imx7dsabresd.conf                     |    3 ++-
 conf/machine/include/imx-base.inc                  |   19 ++++++++++++++++-
 .../imx-kobs/{imx-kobs_5.0.bb => imx-kobs_5.1.bb}  |    4 ++--
 recipes-bsp/imx-lib/imx-lib.inc                    |    1 +
 recipes-bsp/imx-lib/imx-lib_5.0.bb                 |   10 ---------
 recipes-bsp/imx-lib/imx-lib_5.1.bb                 |   10 +++++++++
 recipes-bsp/imx-test/imx-test.inc                  |    2 ++
 .../imx-test/{imx-test_5.0.bb => imx-test_5.1.bb}  |    4 ++--
 .../{imx-vpu_5.4.30.bb => imx-vpu_5.4.31.bb}       |    5 ++---
 ...ol_2014.04.bb => u-boot-imx-mfgtool_2015.04.bb} |    0
 ...u-boot-imx_2014.04.bb => u-boot-imx_2015.04.bb} |    4 ++--
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc       |    2 +-
 .../xserver-xf86-config/mx6ul/xorg.conf            |   12 +++++++++++
 recipes-kernel/linux/linux-imx_3.14.38.bb          |    8 ++++++-
 15 files changed, 83 insertions(+), 23 deletions(-)
 create mode 100644 conf/machine/imx6ulevk.conf
 rename recipes-bsp/imx-kobs/{imx-kobs_5.0.bb => imx-kobs_5.1.bb} (68%)
 delete mode 100644 recipes-bsp/imx-lib/imx-lib_5.0.bb
 create mode 100644 recipes-bsp/imx-lib/imx-lib_5.1.bb
 rename recipes-bsp/imx-test/{imx-test_5.0.bb => imx-test_5.1.bb} (58%)
 rename recipes-bsp/imx-vpu/{imx-vpu_5.4.30.bb => imx-vpu_5.4.31.bb} (56%)
 rename recipes-bsp/u-boot/{u-boot-imx-mfgtool_2014.04.bb => u-boot-imx-mfgtool_2015.04.bb} (100%)
 rename recipes-bsp/u-boot/{u-boot-imx_2014.04.bb => u-boot-imx_2015.04.bb} (84%)
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf

-- 
1.7.9.5

[meta-fsl-arm][PATCH 01/12] linux-imx: Add changes for 3.14.38-6UL7D_beta release

[Lauren Post]

Add support for i.MX 6UltraLite.

i.MX 6UltraLite and i.MX 7Dual SabreSD beta were released
on a different branch so specify SRCBRANCH and SRCREV by SoC.

Remove file://0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
as it no longer applies with this kernel version

Keep 6QP_beta branch only for the imx6qpsabreauto board since
some patches in 6qp_beta are not in the 6ul7d_beta for QuadPlus only.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 recipes-kernel/linux/linux-imx_3.14.38.bb |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx_3.14.38.bb b/recipes-kernel/linux/linux-imx_3.14.38.bb
index 58661eb..faec8aa 100644
--- a/recipes-kernel/linux/linux-imx_3.14.38.bb
+++ b/recipes-kernel/linux/linux-imx_3.14.38.bb
@@ -10,12 +10,16 @@ require recipes-kernel/linux/linux-dtb.inc
 
 DEPENDS += "lzop-native bc-native"
 
-SRCBRANCH = "imx_3.14.38_6qp_beta"
-LOCALVERSION = "-6QP_beta"
-SRCREV = "a4dec7730c98f2639fe250a1a67f782b6f73bdf5"
+SRCBRANCH = "imx_3.14.38_6ul7d_beta"
+LOCALVERSION = "-6UL7D_beta"
+SRCREV = "1b058645ab95717db8df7de389e1c725dc0c49cc"
+
+# note some 6QP changes might not be in 6ul7d_beta
+SRCBRANCH_imx6qpsabreauto = "imx_3.14.38_6qp_beta"
+LOCALVERSION_imx6qpsabreauto = "-6QP_beta"
+SRCREV_imx6qpsabreauto = "a4dec7730c98f2639fe250a1a67f782b6f73bdf5"
 
 SRC_URI += " \
-    file://0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch \
     file://0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch \
 "
 
-- 
1.7.9.5

[meta-fsl-arm][PATCH 02/12] imx7dsabresd: Add sim imx7d-sdb-sim device trees

[Lauren Post]

Add the SIM1 device tree support on i.MX 7D SABRE SD

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 conf/machine/imx7dsabresd.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 1a8f27b..14fac3b 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -13,7 +13,7 @@ SOC_FAMILY = "mx7:mx7d"
 
 KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-enet.dtb imx7d-sdb-epdc.dtb \
                      imx7d-sdb-gpmi-weim.dtb imx7d-sdb-hdmi-audio.dtb imx7d-sdb-m4.dtb \
-                     imx7d-sdb-qspi.dtb imx7d-sdb-wm8960.dtb"
+                     imx7d-sdb-qspi.dtb imx7d-sdb-wm8960.dtb imx7d-sdb-sim.dtb"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-- 
1.7.9.5

[meta-fsl-arm][PATCH 03/12] imx7dsabresd: Add touch imx7d-sdb-touch device tree

[Lauren Post]

Add an new dts file: imx7d-sdb-touch.dts.This file adds tsc2046 touch
screen controller support. Due to the pin PENIRQ of tsc2046 is conflict
with the interrupt pin of HDMI, so in this patch, disable the HDMI.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 conf/machine/imx7dsabresd.conf |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 14fac3b..9ee9ea3 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -13,7 +13,8 @@ SOC_FAMILY = "mx7:mx7d"
 
 KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-enet.dtb imx7d-sdb-epdc.dtb \
                      imx7d-sdb-gpmi-weim.dtb imx7d-sdb-hdmi-audio.dtb imx7d-sdb-m4.dtb \
-                     imx7d-sdb-qspi.dtb imx7d-sdb-wm8960.dtb imx7d-sdb-sim.dtb"
+                     imx7d-sdb-qspi.dtb imx7d-sdb-wm8960.dtb imx7d-sdb-sim.dtb \
+                     imx7d-sdb-touch.dtb"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-- 
1.7.9.5

[meta-fsl-arm][PATCH 04/12] imx6ulevk: Create i.MX 6 UltraLite EVK machine

[Lauren Post]

Introducing the i.MX 6 Ultra Lite EVK machine.
i.MX 6 UltraLite is a CortexA7 with no GPU or VPU.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 conf/machine/imx6ulevk.conf |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 conf/machine/imx6ulevk.conf

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
new file mode 100644
index 0000000..319d9f0
--- /dev/null
+++ b/conf/machine/imx6ulevk.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6UL Evaluation Kit
+#@SOC: i.MX6UL
+#@DESCRIPTION: Machine configuration for Freescale i.MX6UL EVK
+#@MAINTAINER: Lauren Post <lauren.post@freescale.com>
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa7.inc
+
+MACHINE_FEATURES += " pci wifi bluetooth"
+
+SOC_FAMILY = "mx6:mx6ul"
+
+KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb"
+
+PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard"
+UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config"
+UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config"
-- 
1.7.9.5

[meta-fsl-arm][PATCH 05/12] imx-base: Changes for i.MX 6Ultra Lite

[Lauren Post]

Create the additiosn for 6ul SOC family.

i.MX 6Ultra Lite has no GPU or VPU so change settings
that assume mx6 has a GPU to use mesa for graphics.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 conf/machine/include/imx-base.inc |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index d2b7f7a..d3be1e4 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -23,6 +23,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER_DRIVER = "xf86-video-fbdev"
 XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
 XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante"
+XSERVER_DRIVER_mx6ul = "xf86-video-fbdev"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            ${XSERVER_DRIVER}"
@@ -40,6 +41,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 # DEFAULTTUNE_mx6 ?= "cortexa9t-neon"
 # handled by hardware
 DEFAULTTUNE_mx6 ?= "cortexa9thf-neon"
+DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon"
 DEFAULTTUNE_mx7 ?= "cortexa7thf-neon"
 
 # Sub-architecture support
@@ -52,6 +54,7 @@ MACHINE_SOCARCH_SUFFIX_mx6sl = "-mx6sl"
 MACHINE_SOCARCH_SUFFIX_mx7 = "-mx7d"
 MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60"
 MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50"
+MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
 MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser"
@@ -93,24 +96,38 @@ PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 PREFERRED_PROVIDER_amd-gpu-mx51 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 
 # mx6 GPU libraries
-PREFERRED_PROVIDER_virtual/egl_mx6 ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/egl_mx6q ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/egl_mx6dl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/egl_mx6sx ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/egl_mx6sl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/egl_mx6ul ?= "mesa"
+
 PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles1_mx6ul ?= "mesa"
+
 PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles2_mx6ul ?= "mesa"
+
 PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgl_mx6ul ?= "mesa"
+
 PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libg2d_mx6ul = ""
 
 # Handle default kernel
 IMX_DEFAULT_KERNEL = "linux-imx"
 IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-mx6"
+IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
+
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-- 
1.7.9.5

[meta-fsl-arm][PATCH 06/12] u-boot-imx: Upgrade to 2015.04 version

[Lauren Post]

Upgrade to 2015.04 version and add i.MX 6UltraLite.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 ...ol_2014.04.bb => u-boot-imx-mfgtool_2015.04.bb} |    0
 ...u-boot-imx_2014.04.bb => u-boot-imx_2015.04.bb} |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-imx-mfgtool_2014.04.bb => u-boot-imx-mfgtool_2015.04.bb} (100%)
 rename recipes-bsp/u-boot/{u-boot-imx_2014.04.bb => u-boot-imx_2015.04.bb} (84%)

diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2015.04.bb
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
rename to recipes-bsp/u-boot/u-boot-imx-mfgtool_2015.04.bb
diff --git a/recipes-bsp/u-boot/u-boot-imx_2014.04.bb b/recipes-bsp/u-boot/u-boot-imx_2015.04.bb
similarity index 84%
rename from recipes-bsp/u-boot/u-boot-imx_2014.04.bb
rename to recipes-bsp/u-boot/u-boot-imx_2015.04.bb
index c4c8670..ab53d9d 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2015.04.bb
@@ -8,9 +8,9 @@ PROVIDES += "u-boot"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCBRANCH = "imx_v2014.04_3.14.38_6qp_beta"
+SRCBRANCH = "imx_v2015.04_3.14.38_6ul7d_beta"
 SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
-SRCREV = "6e9282c2567b2820699fa55d2c6bf0ab78e992d6"
+SRCREV = "b026e66a5bb6c2b6fda9e353dfe9061306c69da4"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.9.5

[meta-fsl-arm][PATCH 07/12] imx-kobs: Upgrade to 5.1 version

[Lauren Post]

Add i.MX 6UltraLite support.

When kobs-ng generates FCB with BCH ecc parity, ecc data might NOT byte
align, and requires join the ecc with real FCB data. When the ecc data is
byte aligned, the operation is not necessary, just simply copy the data.

Generalize the encode_bch_ecc function for different configurations.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../imx-kobs/{imx-kobs_5.0.bb => imx-kobs_5.1.bb}  |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename recipes-bsp/imx-kobs/{imx-kobs_5.0.bb => imx-kobs_5.1.bb} (68%)

diff --git a/recipes-bsp/imx-kobs/imx-kobs_5.0.bb b/recipes-bsp/imx-kobs/imx-kobs_5.1.bb
similarity index 68%
rename from recipes-bsp/imx-kobs/imx-kobs_5.0.bb
rename to recipes-bsp/imx-kobs/imx-kobs_5.1.bb
index cf51313..be0ac9c 100644
--- a/recipes-bsp/imx-kobs/imx-kobs_5.0.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_5.1.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 SRC_URI = "${FSL_MIRROR}/imx-kobs-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "a5ae42bdc5daefa3c2f939f860abfd20"
-SRC_URI[sha256sum] = "68402230910b9f82690988eb6deb612f724f2dbc8aa6f9376714062b898e5702"
+SRC_URI[md5sum] = "b3217106d2ea7da2774835bf264633f1"
+SRC_URI[sha256sum] = "28c7356187ae26a2b37fb37a4b7bfdb63b3628b72d737d897ae6d5b969fbb51a"
 
 inherit  autotools pkgconfig
 
-- 
1.7.9.5

[meta-fsl-arm][PATCH 08/12] imx-lib: Upgrade to 5.1 and add i.MX 6UltraLite support

[Lauren Post]

Enable pxp libraries for i.MX 6UltraLite.
Fix rng and shara2 to exclude the 6UL platform to avoid build breaks

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 recipes-bsp/imx-lib/imx-lib.inc    |    1 +
 recipes-bsp/imx-lib/imx-lib_5.0.bb |   10 ----------
 recipes-bsp/imx-lib/imx-lib_5.1.bb |   10 ++++++++++
 3 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 recipes-bsp/imx-lib/imx-lib_5.0.bb
 create mode 100644 recipes-bsp/imx-lib/imx-lib_5.1.bb

diff --git a/recipes-bsp/imx-lib/imx-lib.inc b/recipes-bsp/imx-lib/imx-lib.inc
index 5242cba..2e31626 100644
--- a/recipes-bsp/imx-lib/imx-lib.inc
+++ b/recipes-bsp/imx-lib/imx-lib.inc
@@ -12,6 +12,7 @@ PLATFORM_mx5 = "IMX51"
 PLATFORM_mx6sl = "IMX6S"
 PLATFORM_mx6sx = "IMX6S"
 PLATFORM_mx7   = "IMX7"
+PLATFORM_mx6ul = "IMX6UL"
 
 PARALLEL_MAKE="-j 1"
 EXTRA_OEMAKE = ""
diff --git a/recipes-bsp/imx-lib/imx-lib_5.0.bb b/recipes-bsp/imx-lib/imx-lib_5.0.bb
deleted file mode 100644
index 8fa9e88..0000000
--- a/recipes-bsp/imx-lib/imx-lib_5.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2015 Freescale Semiconductor
-
-include imx-lib.inc
-
-PE = "1"
-
-SRC_URI[md5sum] = "d38daf723e270387ba41041f7b588ac4"
-SRC_URI[sha256sum] = "0215acc97ca7e1c8dbdc2f1f9c7e85dae0725fdac56b79e8ec1c37e47a6d38a5"
-
-COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-bsp/imx-lib/imx-lib_5.1.bb b/recipes-bsp/imx-lib/imx-lib_5.1.bb
new file mode 100644
index 0000000..e84534d
--- /dev/null
+++ b/recipes-bsp/imx-lib/imx-lib_5.1.bb
@@ -0,0 +1,10 @@
+# Copyright (C) 2013-2015 Freescale Semiconductor
+
+include imx-lib.inc
+
+PE = "1"
+
+SRC_URI[md5sum] = "d504131b9bc3d3fb798d4ee8718d6eaf"
+SRC_URI[sha256sum] = "2b4547ffb1de328cf8997a09a423c6f015d808493efd11a98a5d42c6497e3445"
+
+COMPATIBLE_MACHINE = "(mx6|mx7)"
-- 
1.7.9.5

[meta-fsl-arm][PATCH 09/12] imx-test: Upgrade to 5.1 version and add 6UL support

[Lauren Post]

Adding i.MX 6UltraLite support
Fix scc build exclusion in makefile

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 recipes-bsp/imx-test/imx-test.inc                  |    2 ++
 .../imx-test/{imx-test_5.0.bb => imx-test_5.1.bb}  |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename recipes-bsp/imx-test/{imx-test_5.0.bb => imx-test_5.1.bb} (58%)

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index 12cf0e1..a459ea9 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -9,6 +9,7 @@ DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6sl = "virtual/kernel imx-lib"
 DEPENDS_mx6sx = "virtual/kernel imx-lib"
 DEPENDS_mxs   = "virtual/kernel"
+DEPENDS_mx6ul = "virtual/kernel imx-lib"
 DEPENDS_mx7   = "virtual/kernel imx-lib"
 
 
@@ -30,6 +31,7 @@ PLATFORM_mx6sx = "IMX6SX"
 PLATFORM_mx53 = "IMX53"
 PLATFORM_mx51 = "IMX51"
 PLATFORM_mx7 = "IMX7D"
+PLATFORM_mx6ul = "IMX6UL"
 
 # Required so the fixdep binary is generated
 addtask make_scripts after do_patch before do_compile
diff --git a/recipes-bsp/imx-test/imx-test_5.0.bb b/recipes-bsp/imx-test/imx-test_5.1.bb
similarity index 58%
rename from recipes-bsp/imx-test/imx-test_5.0.bb
rename to recipes-bsp/imx-test/imx-test_5.1.bb
index 90e34d5..ff42c7f 100644
--- a/recipes-bsp/imx-test/imx-test_5.0.bb
+++ b/recipes-bsp/imx-test/imx-test_5.1.bb
@@ -5,7 +5,7 @@ include imx-test.inc
 SRC_URI_append_mx5 = " file://clocks.sh"
 SRC_URI_append_mxs = " file://clocks.sh"
 
-SRC_URI[md5sum] = "9a44d97f9133cfb933351cf57fe68bb1"
-SRC_URI[sha256sum] = "d78c3c0c5f4b74e4efb625b030cd2bb9499143358140e64d2f4f0bba10904a9c"
+SRC_URI[md5sum] = "5991439d4b20abac1095688164d26f40"
+SRC_URI[sha256sum] = "042d0b03d7838395a6b35d0ca7159f1f4b6cf3055dcc4a12a1b66488fca987b1"
 
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7)"
-- 
1.7.9.5

[meta-fsl-arm][PATCH 10/12] imx-vpu: Upgrade to 5.4.31 version

[Lauren Post]

- Fix VPU blocked in BWB module.
- Adding new soc name for i.MX6QP

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../{imx-vpu_5.4.30.bb => imx-vpu_5.4.31.bb}       |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename recipes-bsp/imx-vpu/{imx-vpu_5.4.30.bb => imx-vpu_5.4.31.bb} (56%)

diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.30.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.31.bb
similarity index 56%
rename from recipes-bsp/imx-vpu/imx-vpu_5.4.30.bb
rename to recipes-bsp/imx-vpu/imx-vpu_5.4.31.bb
index 09e1df9..d20299f 100644
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.30.bb
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.31.bb
@@ -1,12 +1,11 @@
 # Copyright (C) 2013-2015 Freescale Semiconductor
 
 require imx-vpu.inc
-
 LIC_FILES_CHKSUM = "file://COPYING;md5=01ba08a2b77c3a0a9d0ab5d4d83fed64"
 
 PE = "1"
 
-SRC_URI[md5sum] = "1e48e8367478c86ffd06b6330b50a678"
-SRC_URI[sha256sum] = "43f613fcc0e40abdb69ba9fcf3ac49649b1a6f84ee7c79fe262e0faac072d8e6"
+SRC_URI[md5sum] = "2587d0d011b65021aef469d17ca5c658"
+SRC_URI[sha256sum] = "a266ab317fbd866541eae506d68983bcd361f49d1162a66bb34cb8088ceec88c"
 
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.7.9.5

[meta-fsl-arm][PATCH 11/12] xserver-xf86-config: Add i.MX6UL xorg.conf

[Lauren Post]

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../xserver-xf86-config/mx6ul/xorg.conf            |   12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf

diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf
new file mode 100644
index 0000000..79b6c0f
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf
@@ -0,0 +1,12 @@
+Section "Device"
+    Identifier  "Kernel Framebuffer Device"
+    Driver      "fbdev"
+    Option      "fbdev" "/dev/fb0"
+EndSection
+
+Section "ServerFlags"
+    Option "BlankTime"  "0"
+    Option "StandbyTime"  "0"
+    Option "SuspendTime"  "0"
+    Option "OffTime"  "0"
+EndSection
-- 
1.7.9.5

[meta-fsl-arm][PATCH 12/12] imx-gpu-viv: Change compatible machine to mx6 with GPU

[Lauren Post]

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 401046f..5de8a3d 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -346,4 +346,4 @@ FILES_imx-gpu-viv-demos = "/opt"
 FILES_imx-gpu-viv-demos-dbg = "/opt/viv_samples/*/*/.debug"
 INSANE_SKIP_imx-gpu-viv-demos += "rpaths"
 
-COMPATIBLE_MACHINE = "(mx6)"
+COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl)"
-- 
1.7.9.5

Re: [meta-fsl-arm][PATCH 01/12] linux-imx: Add changes for 3.14.38-6UL7D_beta release

[Otavio Salvador]

Hello Lauren,

On Fri, Jul 31, 2015 at 11:18 AM, Lauren Post <lauren.post@freescale.com> wrote:
> Add support for i.MX 6UltraLite.
>
> i.MX 6UltraLite and i.MX 7Dual SabreSD beta were released
> on a different branch so specify SRCBRANCH and SRCREV by SoC.
>
> Remove file://0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
> as it no longer applies with this kernel version
>
> Keep 6QP_beta branch only for the imx6qpsabreauto board since
> some patches in 6qp_beta are not in the 6ul7d_beta for QuadPlus only.
>
> Signed-off-by: Lauren Post <lauren.post@freescale.com>

I understand the reason you are using different branches and this is a
very valid use case, however we cannot do that as a machine specific
thing.

We need to have the localversion, branch and srcrev set for every SoC
family so this would be:

 - imx7
 - imx6q
 - imx6dl
 - imx6sx
 - imx6sl
 - imx6ul

and this should be explicit in the compatible machine as well.

-- 
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

Re: [meta-fsl-arm][PATCH 00/12] Upgrade to i.MX 6UL7D Beta

[Otavio Salvador]

On Fri, Jul 31, 2015 at 11:18 AM, Lauren Post <lauren.post@freescale.com> wrote:
> Upgrade for 3.14.38-6UL7D beta release introducing the
> i.MX 6UltraLite EVK.
>
> Upgrade to 2015.04 U-BOot
> Upgrade BSP components imx-vpu, imx-lib, imx-test and imx-kobs
> Changes to build issues with i.MX 6 without a GPU

I have pushed all ready to merge patches in master-next. Very few are
skipped and those are due the linux-imx requiring rework.

Please rebase those and send a v2 addressing the linux-imx comments so
we can merge them all.

-- 
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