From 7ee95ffca6a975866d48aa30ce192b5d6ea81bd7 Mon Sep 17 00:00:00 2001
From: Daiane Angolini <daiane.angolini@freescale.com>
Date: Fri, 15 Mar 2013 14:24:00 -0300
Subject: [PATCH] u-boot (2009.08): Add imx6slevk support

iMX6SL EVK u-boot from Freescale 3.0.0 BSP

Change-Id: Iedb942f3f1669991711c3b6bffb409ed288180e8
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
---
 ...e-patch-for-the-default-environment-.patch | 67 +++++++++++++++++++
 .../recipes-bsp/u-boot/u-boot-imx_2009.08.bb  |  8 ++-
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch

diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch
new file mode 100644
index 00000000..5d3f868d
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch
@@ -0,0 +1,67 @@
+From bf99fdddbca321f7e74ed82febbe4b5539e3ac66 Mon Sep 17 00:00:00 2001
+From: Daiane Angolini <daiane.angolini@freescale.com>
+Date: Thu, 14 Mar 2013 16:35:35 -0300
+Subject: [PATCH] mx6sl_evk: Change the patch for the default environment
+ variable
+
+Upstream-Status: Pending
+
+Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
+---
+ include/configs/mx6sl_evk.h |   40 ++++++++++++++++++++++++----------------
+ 1 file changed, 24 insertions(+), 16 deletions(-)
+
+diff --git a/include/configs/mx6sl_evk.h b/include/configs/mx6sl_evk.h
+index 4c327bc..dfb6374 100644
+--- a/include/configs/mx6sl_evk.h
++++ b/include/configs/mx6sl_evk.h
+@@ -122,22 +122,30 @@
+ #define CONFIG_RD_LOADADDR	0x81000000
+ 
+ #define	CONFIG_EXTRA_ENV_SETTINGS					\
+-		"netdev=eth0\0"						\
+-		"ethprime=FEC0\0"					\
+-		"uboot=u-boot.bin\0"			\
+-		"kernel=uImage\0"				\
+-		"nfsroot=/opt/eldk/arm\0"				\
+-		"bootargs_base=setenv bootargs console=ttymxc0,115200\0"\
+-		"bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
+-			"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
+-		"bootcmd_net=run bootargs_base bootargs_nfs; "		\
+-			"tftpboot ${loadaddr} ${kernel}; bootm\0"	\
+-		"bootargs_mmc=setenv bootargs ${bootargs} "     \
+-			"root=/dev/mmcblk0p1 rootwait\0"                \
+-		"bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
+-		"mmc dev 1; "	\
+-		"mmc read ${loadaddr} 0x800 0x2000; bootm\0"	\
+-		"bootcmd=run bootcmd_mmc\0"                             \
++	 "script=boot.scr\0" \
++	 "uimage=uImage\0" \
++	 "mmcdev=1\0" \
++	 "mmcpart=1\0" \
++	 "mmcroot=/dev/mmcblk0p2 rw\0" \
++	 "mmcrootfstype=ext3 rootwait\0" \
++	 "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
++	 "root=${mmcroot} " \
++	 "rootfstype=${mmcrootfstype}\0" \
++	 "loadbootscript=" \
++	 "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++	 "bootscript=echo Running bootscript from mmc ...; " \
++	 "source\0" \
++	 "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
++	 "mmcboot=echo Booting from mmc ...; " \
++	 "run mmcargs; " \
++	 "bootm\0" \
++	 "netargs=setenv bootargs console=ttymxc0,${baudrate} " \
++	 "root=/dev/nfs " \
++	 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
++	 "netboot=echo Booting from net ...; " \
++	 "run netargs; " \
++	 "dhcp ${uimage}; bootm\0" \
++	 "bootcmd=run loaduimage; run mmcboot;\0" \
+ 
+ 
+ #define CONFIG_ARP_TIMEOUT	200UL
+-- 
+1.7.10.4
+
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
index 2ddbd150..cd413d61 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
 
 DEPENDS_mxs += "elftosb-native"
 
-PR = "r12"
+PR = "r13"
 
 # Revision of imx_2.6.35_10.12.01 branch
 SRCREV_mxs = "e4437f1c192a1a68028e6fcff3f50ff50352041d"
@@ -29,6 +29,11 @@ SRC_URI_append_mx6 = " \
    file://mx6q_sabresd-Change-default-environment-to-work-with.patch \
 "
 
+# Revision of imx_3.0.35_3.0.0 branch
+SRCREV_mx6sl = "d4057eba315edbc8335c138c0c9edbe2109ea36e"
+SRC_URI_append_mx6sl = " \
+   file://mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch \
+"
 
 SRC_URI = "git://git.freescale.com/imx/uboot-imx.git"
 
@@ -38,6 +43,7 @@ UBOOT_MACHINE_imx51evk = "mx51_bbg_config"
 UBOOT_MACHINE_imx6qsabrelite = "mx6q_sabrelite_config"
 UBOOT_MACHINE_imx6qsabreauto = "mx6q_sabreauto_config"
 UBOOT_MACHINE_imx6qsabresd = "mx6q_sabresd_config"
+UBOOT_MACHINE_imx6slevk = "mx6sl_evk_config"
 UBOOT_MACHINE_imx28evk = "mx28_evk_config"
 
 UBOOT_MAKE_TARGET = "u-boot.bin"
-- 
2.40.1