From c149850baa1286ea04b812acc1443895d878b04b Mon Sep 17 00:00:00 2001
From: Eric Nelson <eric.nelson@boundarydevices.com>
Date: Wed, 25 Sep 2013 12:07:50 -0700
Subject: [PATCH] nitrogen6x: use 6x_bootscript/6x_upgrade instead of older 6q_
 versions

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../boundarydevices/nitrogen6x/6q_bootscript  | Bin 455 -> 0 bytes
 .../boundarydevices/nitrogen6x/6x_bootscript  | Bin 0 -> 1653 bytes
 .../nitrogen6x/{6q_upgrade => 6x_upgrade}     | Bin 1587 -> 1744 bytes
 .../boundarydevices/nitrogen6x/post-build.sh  |  14 ++++++++------
 4 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 board/boundarydevices/nitrogen6x/6q_bootscript
 create mode 100644 board/boundarydevices/nitrogen6x/6x_bootscript
 rename board/boundarydevices/nitrogen6x/{6q_upgrade => 6x_upgrade} (59%)

diff --git a/board/boundarydevices/nitrogen6x/6q_bootscript b/board/boundarydevices/nitrogen6x/6q_bootscript
deleted file mode 100644
index e10cfeb0b742f401e36f0f242ca72e45fab26944..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 455
zcma)&!AiqG5QbB+9`Xj>h7#%}CA*=<(z;+3DS`p<P`xI*n|8@=wrpaol;Y8Y58>5^
z(RVTlQ9(qU%MAa_d_OY>-TgVceOq1)j$bXS^JKO0{J#6r-PyBZtqaJh5v$^}^&@v4
zYa!<a)U%OU<luZ&RA;%CoD{`_T2t&|eCQ(trHZ7~lnfCH!BlI+W4!c~qOnZT3OCw)
zBnoH&v5c~mAeh*d5zorsyh_2iCY4PRqj7~JOQwX2{SjIp`6xUIkSh{$Jv;S>|D)iB
zA}MpvE~nGM&3ra(2|*D2fk<M-74b)*i&1Dhn<U>#9WkiR182iTo^Hn&FdCscz^lLI
n-Cd|?!J*%8PE+6Q32?g9&^tFq8>m4dTR_T9#wCb)sb||C*>#HV

diff --git a/board/boundarydevices/nitrogen6x/6x_bootscript b/board/boundarydevices/nitrogen6x/6x_bootscript
new file mode 100644
index 0000000000000000000000000000000000000000..dc9eea481c03145d16959e5ebcc47120ff3cc2c3
GIT binary patch
literal 1653
zcmdT^!EVz)5RED|Qv3sm+sLwt1dg(H(-1YXMA|~B)LeQf+^V%bPF7j(8hc3{Mfnas
zf+HWq5AYGJ9Xn}4p+dR9Ue@-^zMc0x^IjZ2zy0##+xX`E<@ZLTdD5uXv#<8S;X$+E
zOQ|3WQkJMXw6izc#fJ<PiWwB?G#zJvg8Cfq?kQ7uu?*3ZQDjs}0&^8e0c2npEP_cG
zvk(;wKuu5>tz9T<4LZ|#(u?yT@~uUMvOEoO<`o#W<Mv7Z+9jhmJz}%SySY4byKB72
zk1+<b+&s5GG6$<ro}^G$WYrI^z%h_#XtXexNHE*w0wLl3#pnuRDVUO}hKQKv;0B<J
z0JmUMyd<gg5lBwDdy(RyZ(m=WwLe}CD>}Vi&uHmO6lMxcVnQ1~L0xpMUoGGkVTY82
zSDdyptVNl*v~`Zr(uB(JU&`_>Ma%-q5ki(FoX%@)wiP+<@2!YK+-}|@5C8JND@$GM
zpH=DZsY(#q=hwqw`@`*j&?$XF@@}8(C~`kxx_4H6eXRRh;JUAM$Aoe{#%nWp$`-WY
zz!M{`<DnF2)W-A(wpGr?FA3)6cI{-D<mf3i*UseFj&tG?0<)NME(5QtI~A%NpHngQ
z2&CF23uiP-|67sHsG=r#U|Ne%%@bUjznzo^mlsH0N1IP43#p@zRIXKdsQCz^&5<|`
zd_E;fc}~y0HiB%)B@Lmjp?F}~bb0E4L-dc+3pxd6=krxe#|TG9rRB$)u&$tV%(rPO
TQz+1w7{e4(fgD(I$TWTea_I@(

literal 0
HcmV?d00001

diff --git a/board/boundarydevices/nitrogen6x/6q_upgrade b/board/boundarydevices/nitrogen6x/6x_upgrade
similarity index 59%
rename from board/boundarydevices/nitrogen6x/6q_upgrade
rename to board/boundarydevices/nitrogen6x/6x_upgrade
index 2f20efa2e85c761b09da7ae5a935589280dae5eb..cd26b616b0024424764e95f4d54d917c626d36d4 100644
GIT binary patch
delta 325
zcmdnYbAeYzomDc-q;cPrAZM+=3=C`&7@$D?tVh&D8MQdJ4v;``YDsEdnL=?%N`7gH
zLUC$QW@3&`S$ZN@YH~)tf>LruYI3$hsIF6feu<KTH5XKQep(ukrC?BDVqn0PnWmsp
zomO0%lb@IZWTli;7Npir%#)VP%&kzUslhJEnU`OXn39s2mp-w_TN9|NI8C9TC_gC`
zq$7rl6TvrBFfum)1EAEzvytp75ZfoOV^*B(!FY+$bg~SS2A`>diGs0$k%FOuwL(h%
z<b_NklM9&mCO0#KXx7Oym?D4*KQiUQwZ}92!P)DWcY$?$U{RdR$I7{R4NEH{02Cx=
AlmGw#

delta 191
zcmcb>yO~EuomDby5079~0P75P1_sv83{cQmb}W3Nj2av3YmmUiL@|NPGzFFFwBp*F
z{KOQ6+}z}e3#6HoGV><>@Sa@8=+9^{`3&P{CPRbC2beU3Efp*j%oWTOOchKNj1`O&
z3>6F}e`Hc;QsA1rkwt8>K64bK$>c8PT%fLh%zj|Kijxnpuup!&=mMsXvADBya&jst
XKy{=tNrJ`onb<dbv$iraad80vy|FZi

diff --git a/board/boundarydevices/nitrogen6x/post-build.sh b/board/boundarydevices/nitrogen6x/post-build.sh
index 2f3c464db7..1dc5643a5c 100755
--- a/board/boundarydevices/nitrogen6x/post-build.sh
+++ b/board/boundarydevices/nitrogen6x/post-build.sh
@@ -1,18 +1,20 @@
 #!/bin/sh
 # post-build fixups
-# for furthe details, see
-# http://boundarydevices.com/u-boot-conventions-for-i-mx6-nitrogen6x-and-sabrelite/
+# for further details, see
+#
+#  http://boundarydevices.com/u-boot-on-i-mx6/
+#
 
 TARGET_DIR=$1
 IMAGES_DIR=$1/../images
 BOARD_DIR="$(dirname $0)"
 
 # bd u-boot looks for bootscript here
-cp $BOARD_DIR/6q_bootscript $TARGET_DIR
+cp $BOARD_DIR/6x_bootscript $TARGET_DIR
 
 # u-boot / update script for bd upgradeu command
-if [ -e $IMAGES_DIR/u-boot.bin ];
+if [ -e $IMAGES_DIR/u-boot.imx ];
 then
-    cp $IMAGES_DIR/u-boot.bin $TARGET_DIR
-    cp $BOARD_DIR/6q_upgrade $TARGET_DIR
+    cp $IMAGES_DIR/u-boot.imx $TARGET_DIR
+    cp $BOARD_DIR/6x_upgrade $TARGET_DIR
 fi
-- 
2.30.2