u-boot-fslc: Add patch to work with 3.10.31-1.1.0_beta kernel

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>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

2 files changed, 95 insertions, 0 deletions

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..b1a8b8a
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc/iMX6-Change-mmcroot-to-use-fixed-mmc-block-index-for.patch
@@ -0,0 +1,92 @@
+From 6148f4558952fd04d76ec5494447a678df9d79d4 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
+Organization: O.S. Systems Software LTDA.
+
+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      | 2 +-
+ include/configs/mx6qsabreauto.h | 2 +-
+ include/configs/mx6sabresd.h    | 2 +-
+ include/configs/mx6slevk.h      | 2 +-
+ include/configs/mx6sxsabresd.h  | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
+index 6e01fa0..b1719b9 100644
+--- a/include/configs/mx6qarm2.h
++++ b/include/configs/mx6qarm2.h
+@@ -83,7 +83,7 @@
+        "ip_dyn=yes\0" \
+        "mmcdev=1\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=" \
+diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
+index 0ab3127..cca9c8f 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 21ff2bc..635cfc3 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 3b051d7..1b5b616 100644
+--- a/include/configs/mx6slevk.h
++++ b/include/configs/mx6slevk.h
+@@ -89,7 +89,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 e02ea18..dce4851 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=" \
+-- 
+2.1.1
+
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb
index 9fed4d9..1d80d0e 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb
@@ -4,3 +4,6 @@ PV = "v2014.10+git${SRCPV}"
 
 SRCREV = "5fd0b607d0ef44b8b93d64faace674955791dd7d"
 SRCBRANCH = "patches-2014.10"
+
+# Fix to allow booting with 3.10.31-1.1.0 Beta kernel
+SRC_URI += "file://iMX6-Change-mmcroot-to-use-fixed-mmc-block-index-for.patch"