[meta-fsl-arm][PATCH v3 00/14] BSP Upgrade to 3.10.31-1.1.0 Beta v3

[meta-fsl-arm][PATCH v3 00/14] BSP Upgrade to 3.10.31-1.1.0 Beta v3

[Lauren Post]

Upgrade the 310.31-1.1.0 Beta

- linux-imx:  Add CONFIG_NETFILTER=y to defconfig
- Change device trees to use line contiuations
- Add Upstream-Status to u-boot-fslc
- Fix email in imx6sxsabresd machine configuration file.
- Change firmware-imx to use for mx6 and remove 3.0.35 version
- imx-lib: remove 3.10.17 recipe
- imx-test - squash patches

Lauren Post (13):
  linux-imx: Upgrade to 3.10.31-1.1.0 Beta version
  linux-imx-mfgtool: Upgrade to 3.10.31-1.1.0 Beta version
  u-boot-imx: Upgrade to 2014.04 version
  imx6dlsabresd.conf: Add the imx6dl-sabresd-pf200 device tree
  imx6dlsabresd.conf: Add the imx6dl-sabresd-enetirq device tree
  imx6qsabresd.conf: Add the imx6q-sabresd-enetirq device tree
  imx6slevk.conf: Add the imx6slevk-pf200 device tree
  imx6sxsabresd.conf: Create i.MX 6SoloX Machine configuration
  imx-lib: Upgrade to 3.10.31-1.1.0 Beta version
  imx-vpu: Upgrade to 3.10.31-1.1.0 Beta version
  imx-test: Upgrade to 3.10.31-1.1.0 Beta version
  firmware-imx: Upgrade to 3.10.31-1.1.0 Beta version
  u-boot-fslc:  Add patch to work with 3.10.31-1.1.0_beta kernel

 conf/machine/imx6dlsabresd.conf                    |    3 +-
 conf/machine/imx6qsabresd.conf                     |    3 +-
 conf/machine/imx6slevk.conf                        |    3 +-
 conf/machine/imx6sxsabresd.conf                    |   21 +++++
 recipes-bsp/firmware-imx/firmware-imx.inc          |    7 +-
 .../firmware-imx/firmware-imx_3.0.35-4.0.0.bb      |    8 --
 .../firmware-imx/firmware-imx_3.10.17-1.0.0.bb     |   10 ---
 .../firmware-imx/firmware-imx_3.10.31-1.1.0.bb     |   14 +++
 recipes-bsp/imx-lib/imx-lib.inc                    |    2 +
 recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb       |   10 ---
 recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb       |   15 ++++
 recipes-bsp/imx-test/imx-test.inc                  |    4 +-
 ..._3.10.17-1.0.0.bb => imx-test_3.10.31-1.1.0.bb} |    8 +-
 ...etVirtMem-returns-1-MAP_FAILED-on-failure.patch |   83 -----------------
 recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb       |   12 ---
 recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb       |   14 +++
 ...-mmcroot-to-use-fixed-mmc-block-index-for.patch |   93 ++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc_2014.07.bb          |    3 +
 ...ol_2013.04.bb => u-boot-imx-mfgtool_2014.04.bb} |    0
 ...u-boot-imx_2013.04.bb => u-boot-imx_2014.04.bb} |    8 +-
 .../mx6/defconfig                                  |   15 +++-
 .../mx6/defconfig                                  |    5 +-
 ...ool_3.10.17.bb => linux-imx-mfgtool_3.10.31.bb} |    2 +
 .../{linux-imx_3.10.17.bb => linux-imx_3.10.31.bb} |    6 +-
 24 files changed, 204 insertions(+), 145 deletions(-)
 create mode 100644 conf/machine/imx6sxsabresd.conf
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.0.35-4.0.0.bb
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.10.17-1.0.0.bb
 create mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.10.31-1.1.0.bb
 delete mode 100644 recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb
 create mode 100644 recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb
 rename recipes-bsp/imx-test/{imx-test_3.10.17-1.0.0.bb => imx-test_3.10.31-1.1.0.bb} (54%)
 delete mode 100644 recipes-bsp/imx-vpu/imx-vpu/0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch
 delete mode 100644 recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb
 create mode 100644 recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc/iMX6-Change-mmcroot-to-use-fixed-mmc-block-index-for.patch
 rename recipes-bsp/u-boot/{u-boot-imx-mfgtool_2013.04.bb => u-boot-imx-mfgtool_2014.04.bb} (100%)
 rename recipes-bsp/u-boot/{u-boot-imx_2013.04.bb => u-boot-imx_2014.04.bb} (61%)
 rename recipes-kernel/linux/{linux-imx-3.10.17 => linux-imx-3.10.31}/mx6/defconfig (96%)
 rename recipes-kernel/linux/{linux-imx-mfgtool-3.10.17 => linux-imx-mfgtool-3.10.31}/mx6/defconfig (98%)
 rename recipes-kernel/linux/{linux-imx-mfgtool_3.10.17.bb => linux-imx-mfgtool_3.10.31.bb} (87%)
 rename recipes-kernel/linux/{linux-imx_3.10.17.bb => linux-imx_3.10.31.bb} (80%)

-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 01/13] linux-imx: Upgrade to 3.10.31-1.1.0 Beta version

[Lauren Post]

- Add support for mx6sx.
- General fixes for all mx6.
- Upgrade to v5 Vivante graphics driver.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../mx6/defconfig                                  |   15 +++++++++++++--
 .../{linux-imx_3.10.17.bb => linux-imx_3.10.31.bb} |    6 +++---
 2 files changed, 16 insertions(+), 5 deletions(-)
 rename recipes-kernel/linux/{linux-imx-3.10.17 => linux-imx-3.10.31}/mx6/defconfig (96%)
 rename recipes-kernel/linux/{linux-imx_3.10.17.bb => linux-imx_3.10.31.bb} (80%)

diff --git a/recipes-kernel/linux/linux-imx-3.10.17/mx6/defconfig b/recipes-kernel/linux/linux-imx-3.10.31/mx6/defconfig
similarity index 96%
rename from recipes-kernel/linux/linux-imx-3.10.17/mx6/defconfig
rename to recipes-kernel/linux/linux-imx-3.10.31/mx6/defconfig
index fa2eada..9c9c477 100644
--- a/recipes-kernel/linux/linux-imx-3.10.17/mx6/defconfig
+++ b/recipes-kernel/linux/linux-imx-3.10.31/mx6/defconfig
@@ -25,6 +25,7 @@ CONFIG_MACH_EUKREA_CPUIMX51SD=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_VF610=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SMP=y
@@ -61,8 +62,10 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IPV6=y
 CONFIG_NETFILTER=y
 CONFIG_VLAN_8021Q=y
+CONFIG_LLC2=y
 CONFIG_CAN=y
 CONFIG_CAN_FLEXCAN=y
+CONFIG_CAN_M_CAN=y
 CONFIG_CFG80211=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=y
@@ -88,6 +91,8 @@ CONFIG_MTD_SST25L=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_SPI_NOR_BASE=y
+CONFIG_SPI_FSL_QUADSPI=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
@@ -127,6 +132,7 @@ CONFIG_ATH6KL_SDIO=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
 CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_SNVS_PWRKEY=y
 CONFIG_KEYBOARD_IMX=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ELANTECH=y
@@ -157,6 +163,7 @@ CONFIG_I2C_IMX=y
 CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX732X=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_SABRESD_MAX8903=y
 CONFIG_IMX6_USB_CHARGER=y
@@ -195,6 +202,7 @@ CONFIG_MXC_CAMERA_OV5640=m
 CONFIG_MXC_CAMERA_OV5642=m
 CONFIG_MXC_CAMERA_OV5640_MIPI=m
 CONFIG_MXC_TVIN_ADV7180=m
+CONFIG_MXC_VADC=m
 CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
 CONFIG_VIDEO_MXC_IPU_OUTPUT=y
 CONFIG_VIDEO_MXC_PXP_V4L2=y
@@ -219,6 +227,7 @@ CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
 CONFIG_FB_MXC_HDMI=y
 CONFIG_FB_MXC_EINK_PANEL=y
 CONFIG_FB_MXS_SII902X=y
+CONFIG_FB_MXC_DCIC=m
 CONFIG_HANNSTAR_CABC=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@@ -239,18 +248,19 @@ CONFIG_SND_SOC_IMX_SPDIF=y
 CONFIG_SND_SOC_IMX_MC13783=y
 CONFIG_SND_SOC_IMX_HDMI=y
 CONFIG_SND_SOC_IMX_SI476X=y
+CONFIG_SND_SOC_CS42XX8_I2C=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_PHY=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
+CONFIG_USB_G_NCM=m
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_MMC=y
@@ -280,6 +290,8 @@ CONFIG_MXS_DMA=y
 CONFIG_STAGING=y
 CONFIG_COMMON_CLK_DEBUG=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IIO=y
+CONFIG_VF610_ADC=y
 CONFIG_PWM=y
 CONFIG_PWM_IMX=y
 CONFIG_EXT2_FS=y
@@ -355,4 +367,3 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
-CONFIG_FHANDLE=y
diff --git a/recipes-kernel/linux/linux-imx_3.10.17.bb b/recipes-kernel/linux/linux-imx_3.10.31.bb
similarity index 80%
rename from recipes-kernel/linux/linux-imx_3.10.17.bb
rename to recipes-kernel/linux/linux-imx_3.10.31.bb
index 9ec3a3e..10ad2f0 100644
--- a/recipes-kernel/linux/linux-imx_3.10.17.bb
+++ b/recipes-kernel/linux/linux-imx_3.10.31.bb
@@ -10,8 +10,8 @@ require recipes-kernel/linux/linux-dtb.inc
 
 DEPENDS += "lzop-native bc-native"
 
-SRCBRANCH = "imx_3.10.17_1.0.1_ga"
-SRCREV = "dac46dcf913585956a0e7a838e6f4b7465f00f57"
-LOCALVERSION = "-1.0.1_ga"
+SRCBRANCH = "imx_3.10.31_1.1.0_beta"
+SRCREV = "94a7e472c47b800c001c0a5d17bb2f14a13e1980"
+LOCALVERSION = "-1.1.0_beta"
 
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 02/13] linux-imx-mfgtool: Upgrade to 3.10.31-1.1.0 Beta version

[Lauren Post]

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../mx6/defconfig                                  |    5 ++++-
 ...ool_3.10.17.bb => linux-imx-mfgtool_3.10.31.bb} |    2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)
 rename recipes-kernel/linux/{linux-imx-mfgtool-3.10.17 => linux-imx-mfgtool-3.10.31}/mx6/defconfig (98%)
 rename recipes-kernel/linux/{linux-imx-mfgtool_3.10.17.bb => linux-imx-mfgtool_3.10.31.bb} (87%)

diff --git a/recipes-kernel/linux/linux-imx-mfgtool-3.10.17/mx6/defconfig b/recipes-kernel/linux/linux-imx-mfgtool-3.10.31/mx6/defconfig
similarity index 98%
rename from recipes-kernel/linux/linux-imx-mfgtool-3.10.17/mx6/defconfig
rename to recipes-kernel/linux/linux-imx-mfgtool-3.10.31/mx6/defconfig
index a4e880b..677eaa0 100644
--- a/recipes-kernel/linux/linux-imx-mfgtool-3.10.17/mx6/defconfig
+++ b/recipes-kernel/linux/linux-imx-mfgtool-3.10.31/mx6/defconfig
@@ -25,6 +25,7 @@ CONFIG_MACH_EUKREA_CPUIMX51SD=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_VF610=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SMP=y
@@ -67,7 +68,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 CONFIG_CMA=y
-CONFIG_CMA_SIZE_MBYTES=256
+CONFIG_CMA_SIZE_MBYTES=320
 CONFIG_IMX_WEIM=y
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
@@ -85,6 +86,8 @@ CONFIG_MTD_SST25L=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_SPI_NOR_BASE=y
+CONFIG_SPI_FSL_QUADSPI=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
diff --git a/recipes-kernel/linux/linux-imx-mfgtool_3.10.17.bb b/recipes-kernel/linux/linux-imx-mfgtool_3.10.31.bb
similarity index 87%
rename from recipes-kernel/linux/linux-imx-mfgtool_3.10.17.bb
rename to recipes-kernel/linux/linux-imx-mfgtool_3.10.31.bb
index 1400973..5a0fb42 100644
--- a/recipes-kernel/linux/linux-imx-mfgtool_3.10.17.bb
+++ b/recipes-kernel/linux/linux-imx-mfgtool_3.10.31.bb
@@ -1,4 +1,6 @@
 # Copyright (C) 2014 O.S. Systems Software LTDA.
+# Copyright (C) 2014 Freescale Semiconductor
+
 SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel"
 DESCRIPTION = "Linux Kernel provided and supported by Freescale that produces a \
 Manufacturing Tool compatible Linux Kernel to be used in updater environment"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 03/13] u-boot-imx: Upgrade to 2014.04 version

[Lauren Post]

- Add mx6sx support
- General fixes for mx6slevk and other mx6
- Support to use zImage

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

diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2013.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-imx-mfgtool_2013.04.bb
rename to recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
diff --git a/recipes-bsp/u-boot/u-boot-imx_2013.04.bb b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
similarity index 61%
rename from recipes-bsp/u-boot/u-boot-imx_2013.04.bb
rename to recipes-bsp/u-boot/u-boot-imx_2014.04.bb
index 867f0ed..78f2147 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2013.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
@@ -1,16 +1,16 @@
 # Copyright (C) 2013, 2014 Freescale Semiconductor
 
-DESCRIPTION = "bootloader for imx platforms"
+DESCRIPTION = "Bootloader for i.MX platforms"
 require recipes-bsp/u-boot/u-boot.inc
 
 PROVIDES += "u-boot"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCBRANCH = "imx_v2013.04_3.10.17_1.0.0_ga"
+SRCBRANCH = "imx_v2014.04_3.10.31_1.1.0_beta"
 SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
-SRCREV = "ce0ea2507c492d43bbf88f8609482a171b2d2003"
+SRCREV = "91cbd4d530f240042d112fc4166a143fa659524b"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 04/13] imx6dlsabresd.conf: Add the imx6dl-sabresd-pf200 device tree

[Lauren Post]

Add support for pfuze200 on mx6dl-sabresd.

Move pmic device node from imx6qdl-sabresd.dtsi to up-level, and add
another layer on imx6dl-sabresd to diff pfuze100 or pfuze200. Meanwhile
only work in ldo-enable mode if using pfuze200,since 'SW1C' switch
regulator is cut for cost-down which means VDDARM_IN and VDDSOC_IN have
to share the same switch regulator

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

diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index 1e934e1..7345778 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -8,7 +8,8 @@ require conf/machine/include/imx6sabresd-common.inc
 
 SOC_FAMILY = "mx6:mx6dl"
 
-KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb"
+KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
+                     imx6dl-sabresd-pf200.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 05/13] imx6dlsabresd.conf: Add the imx6dl-sabresd-enetirq device tree

[Lauren Post]

Apply ENET IRQ workaround for sabresd board

This is pretty much an example to demonstrate how the GPIO6 workaround
for bug ERR006687 (ENET: Only the ENET wake-up interrupt request can
wake the system from Wait mode) should be applied for a board.

Basically it requires a setup of MX6QDL_PAD_GPIO_6__ENET_IRQ in
pinctrl entry, and an overwrite on the property interrupts-extended to
replace the ENET GIC IRQ with GPIO1_6.

 Since the pad GPIO6 is used by I2C3 on the board, we have to create
 sabresd-enetirq.dts with I2C3 disabled to enable this workaround.

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

diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index 7345778..da3ee54 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -9,7 +9,7 @@ require conf/machine/include/imx6sabresd-common.inc
 SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
-                     imx6dl-sabresd-pf200.dtb"
+                     imx6dl-sabresd-pf200.dtb imx6dl-sabresd-enetirq.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 06/13] imx6qsabresd.conf: Add the imx6q-sabresd-enetirq device tree

[Lauren Post]

Apply ENET IRQ workaround for sabresd board

This is pretty much an example to demonstrate how the GPIO6 workaround
for bug ERR006687 (ENET: Only the ENET wake-up interrupt request can
wake the system from Wait mode) should be applied for a board.

Basically it requires a setup of MX6QDL_PAD_GPIO_6__ENET_IRQ in pinctrl
entry, and an overwrite on the property interrupts-extended to replace
the ENET GIC IRQ with GPIO1_6.

Since the pad GPIO6 is used by I2C3 on the board, we have to create
sabresd-enetirq.dts with I2C3 disabled to enable this workaround.

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

diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index 4b493b9..02b7cdc 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -8,7 +8,8 @@ require conf/machine/include/imx6sabresd-common.inc
 
 SOC_FAMILY = "mx6:mx6q"
 
-KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb"
+KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
+                     imx6q-sabresd-enetirq.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 07/13] imx6slevk.conf: Add the imx6slevk-pf200 device tree

[Lauren Post]

Add support for pfuze200 on imx6slevk

Move pmic device node from imx6sl-evk.dtsi to upper-level, and add
another layer on imx6sl-evk to diff pfuze100 or pfuze200. Meanwhile
only works in ldo-enable mode if using pfuze200, since 'SW1C' switch
regulator is cut for cost-down which means VDDARM_IN and VDDSOC_IN have
to share the same switch regulator

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

diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index cffbd0b..533f85a 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -9,7 +9,8 @@ include conf/machine/include/tune-cortexa9.inc
 
 SOC_FAMILY = "mx6:mx6sl"
 
-KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb"
+KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
+                     imx6sl-evk-pf200.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 08/13] imx6sxsabresd.conf: Create i.MX 6SoloX Machine configuration

[Lauren Post]

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

diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
new file mode 100644
index 0000000..213672b
--- /dev/null
+++ b/conf/machine/imx6sxsabresd.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6SoloX SabreSD
+#@SOC: i.MX6SX
+#@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre SD
+#@MAINTAINER: Lauren Post <Lauren.Post@freescale.com>
+
+require conf/machine/include/imx6sabresd-common.inc
+
+SOC_FAMILY = "mx6:mx6sx"
+
+KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
+                     imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-canfd.dtb"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard"
+UBOOT_CONFIG[emmc] = "mx6sxsabresd_emmc_config,sdcard"
+UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config"
+UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config"
+UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 09/13] imx-lib: Upgrade to 3.10.31-1.1.0 Beta version

[Lauren Post]

Makefiles changed for mx6sx and mx6sl to exclude rng and sahara
since those are not supported on mx6 chips.
Platform is set to MX6S for both mx6sx and mx6sl so the
previous makefiles only excluded MX6Q platform.

Note this is different for imx-test which specifies
MX6SX and MX6SL in makefiles. In imx-lib they are treated the same.

Add PLATFORM setting for mx6sx and mx6sl

imx-lib has pxp libraries only used for mx6sx and mx6sl

Previously used MX6Q but mx6q and mx6dl can't be built with pxp

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 recipes-bsp/imx-lib/imx-lib.inc              |    2 ++
 recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb |   10 ----------
 recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb |   15 +++++++++++++++
 3 files changed, 17 insertions(+), 10 deletions(-)
 delete mode 100644 recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb
 create mode 100644 recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb

diff --git a/recipes-bsp/imx-lib/imx-lib.inc b/recipes-bsp/imx-lib/imx-lib.inc
index 243eb88..314e153 100644
--- a/recipes-bsp/imx-lib/imx-lib.inc
+++ b/recipes-bsp/imx-lib/imx-lib.inc
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b18
 
 PLATFORM_mx6 = "IMX6Q"
 PLATFORM_mx5 = "IMX51"
+PLATFORM_mx6sl = "IMX6S"
+PLATFORM_mx6sx = "IMX6S"
 
 PARALLEL_MAKE="-j 1"
 EXTRA_OEMAKE = ""
diff --git a/recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb b/recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb
deleted file mode 100644
index 93f5482..0000000
--- a/recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013, 2014 Freescale Semiconductor
-
-include imx-lib.inc
-
-PE = "1"
-
-SRC_URI[md5sum] = "8e3346d5f33b5aa5f915a0dd8aa99cc9"
-SRC_URI[sha256sum] = "f42605971977e5fe1ed9e7ce17ea3f97586a23fbc60fa0f679940d379c72303e"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb b/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb
new file mode 100644
index 0000000..9eeda3f
--- /dev/null
+++ b/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb
@@ -0,0 +1,15 @@
+# Copyright (C) 2013, 2014 Freescale Semiconductor
+
+include imx-lib.inc
+
+# FIXME: Drop 'beta' suffix for GA release
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}-beta.tar.gz"
+
+S="${WORKDIR}/${PN}-${PV}-beta"
+
+PE = "1"
+
+SRC_URI[md5sum] = "0485e457eafe5a10274d171b3af79e2f"
+SRC_URI[sha256sum] = "011eb34c6fd1b1ea9894bbe07a539c1aeee1500bc8fdd29d8ce1dc1d02f79e24"
+
+COMPATIBLE_MACHINE = "(mx6)"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 10/13] imx-vpu: Upgrade to 3.10.31-1.1.0 Beta version

[Lauren Post]

Upgrade to v5.4.26 version

- Fixes to support multiple thread robustness
- SOF stuffing new command added used for MJPEG
- VPU performance fixes with multiple instances
- IOGetVirtMem - return checking - Remove patch from recipe
- SOI search performance fixes
- Comment unused registers for mx6 chips as dummy
- Add new registers used on mx6 chips only.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 ...etVirtMem-returns-1-MAP_FAILED-on-failure.patch |   83 --------------------
 recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb       |   12 ---
 recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb       |   14 ++++
 3 files changed, 14 insertions(+), 95 deletions(-)
 delete mode 100644 recipes-bsp/imx-vpu/imx-vpu/0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch
 delete mode 100644 recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb
 create mode 100644 recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb

diff --git a/recipes-bsp/imx-vpu/imx-vpu/0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch b/recipes-bsp/imx-vpu/imx-vpu/0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch
deleted file mode 100644
index 348a536..0000000
--- a/recipes-bsp/imx-vpu/imx-vpu/0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 3f3e374391ddc5e605f604e5bcdf95e29b1bcc39 Mon Sep 17 00:00:00 2001
-From: Eric Nelson <eric.nelson@boundarydevices.com>
-Date: Fri, 20 Jun 2014 19:42:38 -0700
-Subject: [PATCH] IOGetVirtMem returns -1 (MAP_FAILED) on failure
-
-Upstream-Status: Pending
-
-Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
----
- vpu/vpu_io.c  | 2 +-
- vpu/vpu_io.h  | 2 ++
- vpu/vpu_lib.c | 8 ++++----
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c
-index 8cbb571..14759da 100644
---- a/vpu/vpu_io.c
-+++ b/vpu/vpu_io.c
-@@ -265,7 +265,7 @@ int IOSystemInit(void *callback)
- 		goto err;
- 	}
- 
--	if (IOGetVirtMem(&bit_work_addr) <= 0)
-+	if (IOGetVirtMem(&bit_work_addr) == -1)
- 		goto err;
- #endif
- 	UnlockVpu(vpu_semap);
-diff --git a/vpu/vpu_io.h b/vpu/vpu_io.h
-index 392e04a..1e6340d 100644
---- a/vpu/vpu_io.h
-+++ b/vpu/vpu_io.h
-@@ -64,6 +64,8 @@ int IOSystemInit(void *callback);
- int IOSystemShutdown(void);
- int IOGetPhyMem(vpu_mem_desc * buff);
- int IOFreePhyMem(vpu_mem_desc * buff);
-+
-+/* returns -1 ((int)MAP_FAILED) on failure */
- int IOGetVirtMem(vpu_mem_desc * buff);
- int IOFreeVirtMem(vpu_mem_desc * buff);
- int IOGetVShareMem(int size);
-diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c
-index 1fb731b..7a7f42d 100644
---- a/vpu/vpu_lib.c
-+++ b/vpu/vpu_lib.c
-@@ -1764,7 +1764,7 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param)
- 				err_msg("Unable to obtain physical mem\n");
- 				return RETCODE_FAILURE;
- 			}
--			if (IOGetVirtMem(&pEncInfo->picParaBaseMem) <= 0) {
-+			if (IOGetVirtMem(&pEncInfo->picParaBaseMem) == -1) {
- 				IOFreePhyMem(&pEncInfo->picParaBaseMem);
- 				pEncInfo->picParaBaseMem.phy_addr = 0;
- 				err_msg("Unable to obtain virtual mem\n");
-@@ -2982,7 +2982,7 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info)
- 			UnlockVpu(vpu_semap);
- 			return RETCODE_FAILURE;
- 		}
--		if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) {
-+		if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) {
- 			IOFreePhyMem(&pDecInfo->userDataBufMem);
- 			pDecInfo->userDataBufMem.phy_addr = 0;
- 			err_msg("Unable to obtain virtual mem\n");
-@@ -4017,7 +4017,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param)
- 				UnlockVpu(vpu_semap);
- 				return RETCODE_FAILURE;
- 			}
--			if (IOGetVirtMem(&pDecInfo->picParaBaseMem) <= 0) {
-+			if (IOGetVirtMem(&pDecInfo->picParaBaseMem) == -1) {
- 				IOFreePhyMem(&pDecInfo->picParaBaseMem);
- 				pDecInfo->picParaBaseMem.phy_addr = 0;
- 				err_msg("Unable to obtain virtual mem\n");
-@@ -4057,7 +4057,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param)
- 			UnlockVpu(vpu_semap);
- 			return RETCODE_FAILURE;
- 		}
--		if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) {
-+		if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) {
- 			IOFreePhyMem(&pDecInfo->userDataBufMem);
- 			pDecInfo->userDataBufMem.phy_addr = 0;
- 			err_msg("Unable to obtain virtual mem\n");
--- 
-1.9.1
-
diff --git a/recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb b/recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb
deleted file mode 100644
index 7ed9590..0000000
--- a/recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2013, 2014 Freescale Semiconductor
-
-require imx-vpu.inc
-
-PE = "1"
-
-SRC_URI[md5sum] = "71ea1b803864101ebf88a1bab45514d2"
-SRC_URI[sha256sum] = "cd8a7bd50ff3274db76a331cc6622d3ba4bb7c790ce778f303e49187df2dfd72"
-
-SRC_URI_append = " file://0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb b/recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb
new file mode 100644
index 0000000..f6dfb02
--- /dev/null
+++ b/recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2013, 2014 Freescale Semiconductor
+
+require imx-vpu.inc
+
+PE = "1"
+
+# FIXME: Drop 'beta' suffix for GA release
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}-beta.bin;fsl-eula=true"
+S = "${WORKDIR}/${PN}-${PV}-beta"
+
+SRC_URI[md5sum] = "ab76e7395b6a178a8538a6d5beb87656"
+SRC_URI[sha256sum] = "22d0542bd4d7beb88084575c834bf9045c8e2acc43acdd2ec4e0e5534b4b9c5e"
+
+COMPATIBLE_MACHINE = "(mx6)"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 11/13] imx-test: Upgrade to 3.10.31-1.1.0 Beta version

[Lauren Post]

- Fixes to csi_v4l2 test
- Add dcic driver test case
- Add mxc_mcc_tty_test case used for mx6sx
- Fixes for VPU test for IOGetVirtMem Checking and SOF stuffing
- Updates to mxc_v4l2 to use csi_v4l2 tests
- Update HAB to use zImage
- Add MX6SX for mx6sx
- Change MX6S to MX6SL for mx6sl
- Update USB documentation
- Add cxi_v4l2_tvin test case for vadc
- sdma - Support M2D dma copy for 3.10.17
- mmdc - Add mx6sx support
- wdog - Add dbg monitor

Update include PLATFORM and DEPEND for mx6sx and mx6sl

Add mx6sx depends similar to mx6sl.  mx6sx has no VPU like mx6sl.
Update PLATFORM to be specific to mx6sx and mx6sl which both support
PXP but only mx6sx supports mxc_mcc_tty_test tests

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 recipes-bsp/imx-test/imx-test.inc                  |    4 +++-
 ..._3.10.17-1.0.0.bb => imx-test_3.10.31-1.1.0.bb} |    8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
 rename recipes-bsp/imx-test/{imx-test_3.10.17-1.0.0.bb => imx-test_3.10.31-1.1.0.bb} (54%)

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index 94dbdc3..c96fbef 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -5,6 +5,7 @@ DEPENDS_mx5   = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6q  = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6sl = "virtual/kernel imx-lib"
+DEPENDS_mx6sx = "virtual/kernel imx-lib"
 DEPENDS_mxs   = "virtual/kernel"
 
 LICENSE = "GPLv2"
@@ -13,7 +14,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 PE = "1"
 
 PLATFORM_mx6 = "IMX6Q"
-PLATFORM_mx6sl = "IMX6S"
+PLATFORM_mx6sl = "IMX6SL"
+PLATFORM_mx6sx = "IMX6SX"
 PLATFORM_mx53 = "IMX53"
 PLATFORM_mx51 = "IMX51"
 
diff --git a/recipes-bsp/imx-test/imx-test_3.10.17-1.0.0.bb b/recipes-bsp/imx-test/imx-test_3.10.31-1.1.0.bb
similarity index 54%
rename from recipes-bsp/imx-test/imx-test_3.10.17-1.0.0.bb
rename to recipes-bsp/imx-test/imx-test_3.10.31-1.1.0.bb
index 77b51c7..2d29eb7 100644
--- a/recipes-bsp/imx-test/imx-test_3.10.17-1.0.0.bb
+++ b/recipes-bsp/imx-test/imx-test_3.10.31-1.1.0.bb
@@ -2,12 +2,16 @@
 
 include imx-test.inc
 
+# FIXME: Drop 'beta' suffix for GA release
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}-beta.tar.gz"
+S="${WORKDIR}/${PN}-${PV}-beta"
+
 SRC_URI_append_mx5 = " file://revert_epdc_hdr_change.patch \
                        file://clocks.sh"
 SRC_URI_append_mxs = " file://revert_epdc_hdr_change.patch \
                        file://clocks.sh"
 
-SRC_URI[md5sum] = "3e066a84878b93ee52e54a040a7b2b61"
-SRC_URI[sha256sum] = "21bedcbd707e392d8558ec5a73095ca15b4c95ab66deabb06876aaf3f8dac2c4"
+SRC_URI[md5sum] = "6170af41652f1f213d1a86340e103797"
+SRC_URI[sha256sum] = "6aa33ef21932ca0349dbda05b6b151d5d705663180abc5f860670293251aef54"
 
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6)"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 12/13] firmware-imx: Upgrade to 3.10.31-1.1.0 Beta version

[Lauren Post]

This release does not contain Atheros firmware so remove from include

VPU firmware is updated to version v3.1.1_r46060 for mx6

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 recipes-bsp/firmware-imx/firmware-imx.inc          |    7 +------
 .../firmware-imx/firmware-imx_3.0.35-4.0.0.bb      |    8 --------
 .../firmware-imx/firmware-imx_3.10.17-1.0.0.bb     |   10 ----------
 .../firmware-imx/firmware-imx_3.10.31-1.1.0.bb     |   14 ++++++++++++++
 4 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.0.35-4.0.0.bb
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.10.17-1.0.0.bb
 create mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.10.31-1.1.0.bb

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 0f49937..96ff1b0 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -11,17 +11,12 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
 inherit fsl-eula-unpack
 
 do_install() {
-	install -d ${D}/lib/firmware
+    install -d ${D}/lib/firmware
     cp -rfv firmware/* ${D}/lib/firmware/
     find ${D}/lib/firmware -type f -exec chmod 644 '{}' ';'
 
     # Remove files not going to be installed
     find ${D}/lib/firmware/ -name Android.mk -exec rm '{}' ';'
-    rm ${D}/lib/firmware/LICENCE.atheros_firmware \
-       ${D}/lib/firmware/README
-
-    # FIXME: Remove firmware packaged in linux-firmware
-    rm -r ${D}/lib/firmware/ath6k ${D}/lib/firmware/ar3k
 }
 
 python populate_packages_prepend() {
diff --git a/recipes-bsp/firmware-imx/firmware-imx_3.0.35-4.0.0.bb b/recipes-bsp/firmware-imx/firmware-imx_3.0.35-4.0.0.bb
deleted file mode 100644
index d82aac8..0000000
--- a/recipes-bsp/firmware-imx/firmware-imx_3.0.35-4.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require firmware-imx.inc
-
-PR = "r5.0"
-
-SRC_URI[md5sum] = "f23ce8437e141c1d20e3bf175eb3af7f"
-SRC_URI[sha256sum] = "5aaf5e91dbec8072fec613218c0fc939d9a59e74df53054f49ab31f1f0dd25d9"
-
-COMPATIBLE_MACHINE = "(mx5|mx6)"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_3.10.17-1.0.0.bb b/recipes-bsp/firmware-imx/firmware-imx_3.10.17-1.0.0.bb
deleted file mode 100644
index 0e95d02..0000000
--- a/recipes-bsp/firmware-imx/firmware-imx_3.10.17-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2012-2014 Freescale Semiconductor
-
-require recipes-bsp/firmware-imx/firmware-imx.inc
-
-PE="1"
-
-SRC_URI[md5sum] = "29a54f6e5bf889a00cd8ca85080af223"
-SRC_URI[sha256sum] = "768d857dfc1bec344fbd95665e450030d5a0d541a695027f6d7815e0309bea37"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_3.10.31-1.1.0.bb b/recipes-bsp/firmware-imx/firmware-imx_3.10.31-1.1.0.bb
new file mode 100644
index 0000000..133108d
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-imx_3.10.31-1.1.0.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2012-2014 Freescale Semiconductor
+
+require firmware-imx.inc
+
+PE="1"
+
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-beta.bin;fsl-eula=true"
+
+S = "${WORKDIR}/firmware-imx-${PV}-beta"
+
+SRC_URI[md5sum] = "4e102affc4273f424da4cec9f46adae8"
+SRC_URI[sha256sum] = "8fcfc713321c4ffaafee248feb392b7bc9b913b7abee5020fceaca1d1a49ac99"
+
+COMPATIBLE_MACHINE = "(mx5|mx6)"
-- 
1.7.9.5

[meta-fsl-arm][PATCH v3 13/13] u-boot-fslc: Add patch to work with 3.10.31-1.1.0_beta kernel

[Lauren Post]

3.10.31 linux-imx has update to work with fixed mmc blocks
Without this patch the community u-boot will not boot on some
mx6 boards.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 ...-mmcroot-to-use-fixed-mmc-block-index-for.patch |   93 ++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc_2014.07.bb          |    3 +
 2 files changed, 96 insertions(+)
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc/iMX6-Change-mmcroot-to-use-fixed-mmc-block-index-for.patch

diff --git a/recipes-bsp/u-boot/u-boot-fslc/iMX6-Change-mmcroot-to-use-fixed-mmc-block-index-for.patch b/recipes-bsp/u-boot/u-boot-fslc/iMX6-Change-mmcroot-to-use-fixed-mmc-block-index-for.patch
new file mode 100644
index 0000000..855482c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc/iMX6-Change-mmcroot-to-use-fixed-mmc-block-index-for.patch
@@ -0,0 +1,93 @@
+From 42e39ad63e8108d7944caf3bc6268070ac40e202 Mon Sep 17 00:00:00 2001
+From: "Ye.Li" <Ye.Li@freescale.com>
+Date: Mon, 1 Sep 2014 10:33:47 +0800
+Subject: [PATCH] iMX6: Change mmcroot to use fixed mmc block index for USDHC
+
+Kernel changed to use fixed mmcblk index for USDHC, which is
+mmcblk0 --> USDHC1
+mmcblk1 --> USDHC2
+mmcblk2 --> USDHC3
+mmcblk3 --> USDHC4
+Thus, change the default mmcroot in u-boot to fit the changes in kernel.
+
+Upstream-Status: Pending
+
+Signed-off-by: Ye.Li <Ye.Li@freescale.com>
+---
+ include/configs/mx6qarm2.h      |    4 ++--
+ include/configs/mx6qsabreauto.h |    2 +-
+ include/configs/mx6sabresd.h    |    2 +-
+ include/configs/mx6slevk.h      |    2 +-
+ include/configs/mx6sxsabresd.h  |    2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
+index fd651cf..8bc2124 100644
+--- a/include/configs/mx6qarm2.h
++++ b/include/configs/mx6qarm2.h
+@@ -77,8 +77,8 @@
+ 	"fdt_high=0xffffffff\0" \
+ 	"initrd_high=0xffffffff\0" \
+ 	"mmcdev=1\0" \
+-	"mmcpart=2\0" \
+-	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
++	"mmcpart=1\0" \
++	"mmcroot=/dev/mmcblk3p2 rootwait rw\0" \
+ 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
+ 		"root=${mmcroot}\0" \
+ 	"loadbootscript=" \
+diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
+index d1639c4..bdfbbc7 100644
+--- a/include/configs/mx6qsabreauto.h
++++ b/include/configs/mx6qsabreauto.h
+@@ -17,7 +17,7 @@
+ #elif defined CONFIG_MX6DL
+ #define CONFIG_DEFAULT_FDT_FILE	"imx6dl-sabreauto.dtb"
+ #endif
+-#define CONFIG_MMCROOT			"/dev/mmcblk0p2"
++#define CONFIG_MMCROOT			"/dev/mmcblk2p2"
+ #define PHYS_SDRAM_SIZE		(2u * 1024 * 1024 * 1024)
+ 
+ /* USB Configs */
+diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
+index c5b9c4b..c563533 100644
+--- a/include/configs/mx6sabresd.h
++++ b/include/configs/mx6sabresd.h
+@@ -15,7 +15,7 @@
+ #define CONFIG_MACH_TYPE	3980
+ #define CONFIG_MXC_UART_BASE	UART1_BASE
+ #define CONFIG_CONSOLE_DEV		"ttymxc0"
+-#define CONFIG_MMCROOT			"/dev/mmcblk0p2"
++#define CONFIG_MMCROOT			"/dev/mmcblk2p2"
+ #if defined(CONFIG_MX6Q)
+ #define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabresd-ldo.dtb"
+ #elif defined(CONFIG_MX6DL)
+diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
+index 8e3cc02..66d6d04 100644
+--- a/include/configs/mx6slevk.h
++++ b/include/configs/mx6slevk.h
+@@ -87,7 +87,7 @@
+ 	"ip_dyn=yes\0" \
+ 	"mmcdev=0\0" \
+ 	"mmcpart=1\0" \
+-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
++	"mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
+ 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
+ 		"root=${mmcroot}\0" \
+ 	"loadbootscript=" \
+diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
+index 1eda65e..f0fd01a 100644
+--- a/include/configs/mx6sxsabresd.h
++++ b/include/configs/mx6sxsabresd.h
+@@ -61,7 +61,7 @@
+ 	"ip_dyn=yes\0" \
+ 	"mmcdev=0\0" \
+ 	"mmcpart=1\0" \
+-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
++	"mmcroot=/dev/mmcblk3p2 rootwait rw\0" \
+ 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
+ 		"root=${mmcroot}\0" \
+ 	"loadbootscript=" \
+-- 
+1.7.9.5
+
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb
index b219161..3a95661 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb
@@ -4,3 +4,6 @@ PV = "v2014.07"
 
 SRCREV = "a824e891767f8bd15edf54013e23639a3228dc24"
 SRCBRANCH = "patches-2014.07"
+
+#fix to integrate to use with 3.10.31 kernel
+SRC_URI_append_mx6 = " file://iMX6-Change-mmcroot-to-use-fixed-mmc-block-index-for.patch"
-- 
1.7.9.5

Re: [meta-fsl-arm][PATCH v3 00/14] BSP Upgrade to 3.10.31-1.1.0 Beta v3

[Otavio Salvador]

Hello Lauren,

On Thu, Sep 4, 2014 at 10:12 AM, Lauren Post <lauren.post@freescale.com> wrote:
> Upgrade the 310.31-1.1.0 Beta
>
> - linux-imx:  Add CONFIG_NETFILTER=y to defconfig
> - Change device trees to use line contiuations
> - Add Upstream-Status to u-boot-fslc
> - Fix email in imx6sxsabresd machine configuration file.
> - Change firmware-imx to use for mx6 and remove 3.0.35 version
> - imx-lib: remove 3.10.17 recipe
> - imx-test - squash patches

I went through the patches. I found only minor issues:

 - linux-imx-mfgtool which I will squash onto linux-imx update
 - u-boot-fslc patch which can be unconditional

You don't need to send a v4 for it, I fix it here.

Thanks for reworking the patches; I already included this onto the
autobuilder for a new build cycle for test.

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