u-boot: add mx6qsabrelite support

Add patches needed for loading a kernel without Device Tree support

Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 77 insertions, 2 deletions

diff --git a/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_CONFIG_REVISION_TAG.patch b/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_CONFIG_REVISION_TAG.patch
new file mode 100644
index 0000000..f9614fe
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_CONFIG_REVISION_TAG.patch
@@ -0,0 +1,48 @@
+From: Eric Nelson <eric.nelson@boundarydevices.com>
+Date: Mon, 12 Mar 2012 15:04:12 +0000 (+0000)
+Subject: i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG
+X-Git-Url: http://git.denx.de/?p=u-boot%2Fu-boot-imx.git;a=commitdiff_plain;h=044cd2a7318a6480346c4e0824956d0dd25e9ec3;hp=b0634306b222cca35ad4754091c718a59f912bc0
+
+i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG
+
+This is needed to support Freescale-supplied userspaces.
+
+At the moment, both the IPU and VPU libraries provided by Freescale
+in the "imx-lib" package contain routines which scrape the system
+revision from /proc/cpuinfo. In the VPU library, this information is
+used to load the proper firmware, allowing a single binary to be used
+across various i.MX processors.
+
+Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
+Acked-by: Marek Vasut <marex@denx.de>
+Acked-by: Stefano Babic <sbabic@denx.de>
+---
+
+diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
+index 7fe2dc9..1d09a72 100644
+--- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c
++++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
+@@ -215,6 +215,11 @@ int board_mmc_init(bd_t *bis)
+ }
+ #endif
+ 
++u32 get_board_rev(void)
++{
++       return 0x63000 ;
++}
++
+ #ifdef CONFIG_MXC_SPI
+ iomux_v3_cfg_t ecspi1_pads[] = {
+        /* SS1 */
+diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
+index bb3a46b..a1a2267 100644
+--- a/include/configs/mx6qsabrelite.h
++++ b/include/configs/mx6qsabrelite.h
+@@ -33,6 +33,7 @@
+ #define CONFIG_CMDLINE_TAG
+ #define CONFIG_SETUP_MEMORY_TAGS
+ #define CONFIG_INITRD_TAG
++#define CONFIG_REVISION_TAG
+ 
+ /* Size of malloc() pool */
+ #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
diff --git a/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch b/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch
new file mode 100644
index 0000000..09c74af
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch
@@ -0,0 +1,25 @@
+From: Eric Nelson <eric.nelson@boundarydevices.com>
+Date: Sun, 4 Mar 2012 10:51:36 +0000 (+0000)
+Subject: i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE
+X-Git-Url: http://git.denx.de/?p=u-boot%2Fu-boot-imx.git;a=commitdiff_plain;h=5152d09fe89768a119b016b21fc763bc0231d1e8;hp=044cd2a7318a6480346c4e0824956d0dd25e9ec3
+
+i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE
+
+Allow non-dt kernels to boot
+
+Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
+---
+
+diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
+index a1a2267..8bc8a83 100644
+--- a/include/configs/mx6qsabrelite.h
++++ b/include/configs/mx6qsabrelite.h
+@@ -28,6 +28,8 @@
+ #define CONFIG_DISPLAY_CPUINFO
+ #define CONFIG_DISPLAY_BOARDINFO
+ 
++#define CONFIG_MACH_TYPE       3769
++
+ #include <asm/arch/imx-regs.h>
+ 
+ #define CONFIG_CMDLINE_TAG
diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb
index 85f8a0e..2d94670 100644
--- a/recipes-bsp/u-boot/u-boot_git.bb
+++ b/recipes-bsp/u-boot/u-boot_git.bb
@@ -6,14 +6,16 @@ COMPATIBLE_MACHINE = "(imx53qsb|imx53ard|imx51evk|imx28evk|imx6qsabrelite)"
 
 DEPENDS_mxs += "elftosb-native"
 
-PR = "r1"
+PR = "r2"
 
 SRCREV = "6751b05f855bbe56005d5b88d4eb58bcd52170d2"
 
 PV = "v2011.12+git"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \
-           file://mx53-fix-uart-clock.patch"
+           file://mx53-fix-uart-clock.patch \
+           file://mx6qsabrelite_add_CONFIG_REVISION_TAG.patch \
+           file://mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch "
 
 S = "${WORKDIR}/git"