From 2d780ee2f8aa8f7ec42539ee499c6cef64eb3a2b Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Tue, 29 Apr 2014 18:40:09 +0200
Subject: colibri-vf: switch to U-Boot 2014.04 and latest git

This commit switches Colibri VF machine to use the 2014.04 git
branch. The change to latest U-Boot brings proper NAND hardware
ECC support, which is also enabled in latest Linux kernel.

Beside that, burnflash is updated to correctly work with the
new U-Boot version and the altered Config Block location.
---
 conf/machine/colibri-vf.conf                      |   2 +-
 recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb      |  25 ++++++++++++----------
 recipes-kernel/linux/linux-toradex-fsl_git.bb     |   4 ++--
 recipes/images/files/colibri-vf/burnflash.tar.bz2 | Bin 17955 -> 18081 bytes
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 4d1423b..fc9c087 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -14,7 +14,7 @@ SOC_FAMILY = "vf:vf60"
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
-UBOOT_SUFFIX = "nand"
+UBOOT_SUFFIX = "imx"
 UBOOT_MAKE_TARGET = ""
 UBOOT_MACHINE = "colibri_vf_config"
 # note that this is a pure SW solution, don't expect GPU performance
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
index 944a49c..aa238d4 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -3,8 +3,6 @@ require recipes-bsp/u-boot/u-boot.inc
 PROVIDES += "u-boot"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM_colibri-vf = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
-                               file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
 
 PV = "${PR}+gitr${SRCREV}"
@@ -12,9 +10,9 @@ PR = "r0"
 
 S = "${WORKDIR}/git"
 
-SRCREV_colibri-vf = "f624e019a3f37ee4415a407afae0e026dd203714"
+SRCREV_colibri-vf = "2500368a9806f2fdfbf20d656fe265573d4d6b0b"
 SRCREV_apalis-imx6 = "214db18e6c38454e1c4d22b472dda07db062f976"
-SRCBRANCH_colibri-vf = "colibri_vf"   
+SRCBRANCH_colibri-vf = "2014.04-colibri_vf"
 SRCBRANCH_apalis-imx6 = "toradex_imx6"
 SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}"
 
@@ -25,11 +23,16 @@ COMPATIBLE_MACHINE = "(colibri-vf|apalis-imx6)"
 DEFAULT_PREFERENCE_colibri-vf = "1"
 DEFAULT_PREFERENCE_apalis-imx6 = "1"
 
-# colibri_vf: build additionally a u-boot binary used for sd-card boot
-SPL_BINARY_colibri-vf  = "u-boot.imx"
-SPL_IMAGE_colibri-vf   = "u-boot-${MACHINE}-${PV}-${PR}.imx"
-SPL_SYMLINK_colibri-vf = "u-boot-${MACHINE}.imx"
-do_compile_append_colibri-vf() {
-    oe_runmake colibri_vf_sdboot_config
-    oe_runmake 
+# colibri_vf: copy additional U-Boot binary for NAND
+UBOOT_BINARY_NAND_colibri-vf = "u-boot-nand.imx"
+UBOOT_IMAGE_NAND_colibri-vf = "u-boot-nand-${MACHINE}-${PV}-${PR}.imx"
+UBOOT_SYMLINK_NAND_colibri-vf = "u-boot-nand-${MACHINE}.imx"
+
+do_deploy_append_colibri-vf() {
+    install ${S}/${UBOOT_BINARY_NAND} ${DEPLOYDIR}/${UBOOT_IMAGE_NAND}
+
+    cd ${DEPLOYDIR}
+    rm -f ${UBOOT_BINARY_NAND} ${UBOOT_SYMLINK_NAND}
+    ln -sf ${UBOOT_IMAGE_NAND} ${UBOOT_SYMLINK_NAND}
+    ln -sf ${UBOOT_IMAGE_NAND} ${UBOOT_BINARY_NAND}
 }
diff --git a/recipes-kernel/linux/linux-toradex-fsl_git.bb b/recipes-kernel/linux/linux-toradex-fsl_git.bb
index 01d672b..7e059f1 100644
--- a/recipes-kernel/linux/linux-toradex-fsl_git.bb
+++ b/recipes-kernel/linux/linux-toradex-fsl_git.bb
@@ -4,14 +4,14 @@ require recipes-kernel/linux/linux-toradex-fsl.inc
 LINUX_VERSION_colibri-vf = "3.0.15"
 LINUX_VERSION_apalis-imx6 ?= "3.0.35"
 
-SRCREV_colibri-vf = "72249651843f93d50c302833546fb2880052a80f"
+SRCREV_colibri-vf = "d6e1c85db4d0442a38b43d6c28900a1f1a8d760f"
 PR_colibri-vf = "V2.2b1"
 SRCREV_apalis-imx6 = "fbff978ea77f9d0832cc924e91b2497d7cde572c"
 PR_apalis-imx6 = "V2.2b1"
 
 PV = "${LINUX_VERSION}+gitr${SRCREV}"
 S = "${WORKDIR}/git"
-SRCBRANCH_colibri-vf = "colibri_vf"   
+SRCBRANCH_colibri-vf = "colibri_vf_next"
 SRCBRANCH_apalis-imx6 = "toradex_imx6"
 SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}"
 # a Patch
diff --git a/recipes/images/files/colibri-vf/burnflash.tar.bz2 b/recipes/images/files/colibri-vf/burnflash.tar.bz2
index 771f5d5..fca7d76 100644
Binary files a/recipes/images/files/colibri-vf/burnflash.tar.bz2 and b/recipes/images/files/colibri-vf/burnflash.tar.bz2 differ
-- 
cgit v1.2.3