From ef9b4fb5c28bca14ce53d495e3af4e83023c1cc4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 23 Sep 2014 15:28:31 +0200
Subject: [PATCH] nitrogen6x_defconfig: bump u-boot version

To the 2014.07 release. For furture details, see:

http://boundarydevices.com/u-boot-2014-07-release-mx6-boards/

Also update our 6x_upgrade script to the version from that page so the
entire SPI flash gets erased (otherwise it fails on big u-boot builds) and
document how to perform the upgrade.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

u-boot fixup
---
 board/boundarydevices/nitrogen6x/6x_upgrade | Bin 1744 -> 1465 bytes
 board/boundarydevices/nitrogen6x/readme.txt |   4 ++++
 configs/nitrogen6x_defconfig                |   2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/board/boundarydevices/nitrogen6x/6x_upgrade b/board/boundarydevices/nitrogen6x/6x_upgrade
index cd26b616b0024424764e95f4d54d917c626d36d4..395f13faee825d22c4104d91af785436f59a745c 100644
GIT binary patch
delta 373
zcmcb>yOUc+omDdI;@(At!9kmDGcd4LGC%=OWop+%88vs-LXbdannGqtYH^8Pu|lFs
zQht6(T4qkFf~~DWqP0RvMrt0H0u;dHY)f@POufw93a+$FF0P3lIh=5f6Zbu1<ea>Q
z(FjOBV>D;t<eaR_q{Yt(H6t~rIF$=1R?VaUl3LBA2%_#VNy~6@a;7F{<SVG;DOdwl
za2DsJrWPm|f;p4DndO8zL1q-EDWn!97N;s0C>T^YPwrxN1L=Rj><prSwt^_2wah>R
zCLdw(5(H}k*$uUrbFvewiX>bV=zK66F1vwMQ5Gx$l7YGz%7mzyEXZai43YtgLgb<1
H8EhE<LTg#-

literal 1744
zcmb_dO^?$s5Ur55Qu7bEjh0F)AzG!SD<paYD#2lwsw+4kE@?bztu}UKyI;%pz>OmZ
zeh>eEpM=CX&R4tXN(g*toOI^BmwDsK#o6PJgReh-OkO|z-DotwH?no{>+PqrN6p4m
zN&`AnJTduSN7v>z`#_^Xu?B6JTu}ll9xR`&XMu;|T*7%c$8Z53I<E-s9EM&NE~AKc
z;BN=M@9_xQUn0F<%7D?1nO%Z=yWx7Vf7ydx-%l5;I#yMe$6L6&`@0+=lYlWUW-tUZ
zN8v%boJfV1IO0px{1#!lGpHd_GKQNs5C)1_<t~A=>If1gr)V`)_n*C1dEbNni%fMj
ztnxV1(IQ-@A_Zk|Gkyn?_g5ulO6+)3q5ihlr?Sz4c2>ty`@!2e$@ELvVVrcQRPdsh
zRhZ({>(ecc)7Wt<GZfaSG?zj{9GGx^BstAmYRoEUZ;R#7t`S)dwMu3xU|54;lU)2*
zNeYUA3%I0K3#DNCL_#DL2p2ej=g@~98P8;$mQ++q&=!Tyh0<c9mxzglsl#AWpw}wB
zL=|XiwiDv0Yit05PljBkP7Yo66EGV|hY1r6MpB>Q8ij$W;^Bhusua{Nwixk)G#kYY
z(Uh*&bW9bL4CT@8G~~avVP4Ds(2hCOW=^NJ(ws-_#JZr6CJh;3-EYy#eC+%7j$l&j
za=4=_o@n1Z%(dmjj*ql*JPZt-2Xa?Qb;5j`8}Yg(dXUXgjVv&|QpZjLvI$0`@%>?u
z%ezl=_@s{TkjIgv-vT?GQMs{L%UWO`!&V`=;D){s{I*Vf#OZXE*)H!|=AQC6m?1=R
NB^XeVE3=uX{{YL7tK|Ry

diff --git a/board/boundarydevices/nitrogen6x/readme.txt b/board/boundarydevices/nitrogen6x/readme.txt
index a9ded4929c..f01d9f05e0 100644
--- a/board/boundarydevices/nitrogen6x/readme.txt
+++ b/board/boundarydevices/nitrogen6x/readme.txt
@@ -7,3 +7,7 @@ To install, simply extract rootfs.ext2 to first partition of a uSD card:
 sudo dd if=output/images/rootfs.ext2 of=/dev/sdX1
 
 Where 'sdX1' is the device node of the uSD partition.
+
+To upgrade u-boot, cancel autoboot and type:
+
+run upgradeu
diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 5e5b91eee1..245d3d8415 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -16,7 +16,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/63ae4a5/u-boot-63ae4a5.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/f870252/u-boot-f870252.tar.gz"
 
 # kernel
 BR2_LINUX_KERNEL=y
-- 
2.30.2