From 597374cf8c5077bf1f1a5caa713bcd54da6d0db9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Thu, 28 Jan 2016 09:27:48 +0000
Subject: [PATCH] Support for A20-olinuxino-lime

---
 README.md                            |   2 +-
 doc/EN/installation.org              |   3 ++-
 man/freedombone-image.1.gz           | Bin 2339 -> 2342 bytes
 src/freedombone-image-customise      |   4 ++++
 src/freedombone-image-hardware-setup |   4 ++++
 src/freedombone-image-make           |   3 +--
 src/freedombone-image-makefile       |  11 +++++++++++
 website/EN/installation.html         |   5 +++--
 8 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8bae11754..44f456a1d 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ To build a 64bit Qemu image:
 
     freedombone-image -t qemu-x86_64 -s 8G
 
-Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime, olinuxino-lime2 and olinuxino-micro.
 
 Checklist
 =========
diff --git a/doc/EN/installation.org b/doc/EN/installation.org
index 64b37a04e..443f1c106 100644
--- a/doc/EN/installation.org
+++ b/doc/EN/installation.org
@@ -70,7 +70,7 @@ To build a 64bit Qemu image:
 freedombone-image -t qemu-x86_64 -s 8G
 #+END_SRC
 
-Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime, olinuxino-lime2 and olinuxino-micro.
 
 * Checklist
 Before installing Freedombone you will need a few things.
@@ -102,6 +102,7 @@ Currently the following boards are supported:
  * [[http://beagleboard.org/BLACK][Beaglebone Black]]
  * [[http://linux-sunxi.org/Cubietech_Cubieboard2][Cubieboard 2]]
  * [[https://linux-sunxi.org/Cubietruck][Cubietruck (Cubieboard 3)]]
+ * [[https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME/open-source-hardware][olinuxino Lime]]
  * [[https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware][olinuxino Lime2]]
  * [[https://www.olimex.com/Products/OlinuXino/A20/A20-OlinuXino-MICRO/open-source-hardware][olinuxino Micro]]
 
diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz
index 00861c85db8a1275e988d65ffe5c901da30e4c51..2ee33e74eba5434a76d6ed1c8afbd73ba698a32b 100644
GIT binary patch
delta 1252
zcmV<A1RMLK5~dOdABzY8f!?XH2aW@Ox7H?yi$2&RQqNw#z@svM@ypQwdU04EEVNrZ
z&B8<f@!{o*f4}%8f|ki1cb%FBT;v)Q;`*$`RuV&rC0c<5dr?Y=-(Px#_W<!Y04;rv
zQJ=t5mL^Hi*Rn<tBSz6$R4c#TP}h0(RpR2HtvKdKK)bgWdVxQV>57a1L2rS7t(H!m
zI>P>vlmGhw>`9?BgosWz!Cw@81jYT?z4a%9-A{aAEC9ZHM7s8-J2Kip#5M?zHMtZ`
z;k@lZr{P`g3qabHKgH9u!?7r=4rCUYQ(K8gUFREc%pb$r4zPDzXd6FXCT7h_v&)K^
z?$4`OEVu{ZjRulkwg=c+W@?FlBI8J(eU?K@v9Gi^fIwrtL_$hXeoi809nXE?KoTEB
z=>?*JQu*^O)lFKc3~`99P(>%PzNS0mB4aHPfKt|=Iqm?iFQCQ|KM_b1g)VbnvE12E
zYmYz9g~hPqGrZQo#zyXJkiWKqHu*`3gV(!m_+dnpyB-8y{&>jQmxM5XNDM}eN~4gb
z3qRM@6G$cI2+xqxPkQ@;>M8^uvcB`>JDh70`qY9!3ac0ZL1DkO_q#(t-=NV2^y*O>
z!bwq>Tzpb}INvpsd3H1YhZM?|tB8q*2E!Wb;bW!a?qw4~%gB5K@KZ}xG>kx14Nx3f
z9rpzbXcmRO|LLyuze|>X9lCl@v+0s&)&ob{D%vKs@^gbGiu8B$0b;;5+d>ZmXHQz+
z;e_+Wpj9mlMD2(?*Q_c5dUQKwH^lQ4Fuou57H2op)5Yw=8MTAoC}Q~%`BtFU<!!I-
z%pkSib`YN+Mx9h6A|}4cgT|os-czX!3sI&lwp+?Uu(lHp(cB@E4F(u%UHH<JR7mJn
z7v%ix^!8@9_!J^*2eB~9a9lx}T3IYH(X@K;XpZSLU@*zlQuEBz*nVi+R~Q^^MLM*k
zZoL(5Sy>3G4Q1o_IMc0u`#Dh=9u1JvubNTc0=uMr)dj6SJkJ-c;5$T!xV>VNkOmks
zKC86xV_};@Wji}ul%;w=V!DFu1(2pWE>RX{WnVFj&^1yJu$4+avk+f)jMt{(5#5v8
z21*GbR)!wI4tzEDlPw1?GIxiI>FK-K<ryya$hvR3!VhvGT|e@9Fz$8J{lYh7O{Rea
zy7pziFC?VjUefV7wX<-Ojt3kMGCZ54m<R)&nFxIxhc~yAxd$D88{pt1P%ALqkGTL?
zcefup&+`cKQer%bLEjjJia$5Xv4-;$;O~&#;KqzY215}8yK5tt5|{J5JGH+p$qFmF
zDy7#DkBo~m{C{(Gi>3lpa5}re;irB#f__Wzul+42+?r1I@IFB$HyFK4e$Q8$pX9{W
zAG*iLU_uTTByzidnk9sP=wORpn*1Qqneu~#;@=b?6ny3LbnovG;WC2HONGA4w@Zjr
z(Lhgm*ywU|a(j-P+(<u)r_Bn5aa{1VbG3an9<NZ|CQUGmj#FXRCL0ez8!KxY+5Mt6
zy<NP!x*0_$I;9KkoDn7cmg@9(D7JPgvq`f_oc>#sq$avgKEEEHU!T9Cv+1udCuh%I
z`qdNVkQU3xrjv_!l6`E}<;nI#zBKRF@AW?yxvft(f0t^Z&8@Wa_x`PqGJWM8hQD9i
Oiv9#E0b&x46aWBUO=k`O

delta 1236
zcmV;_1S|Wd5~C6aABzY8bzi2j2aW@O<Z#gkc0}sg%NKZ5<}ZFZ8o(?L>w|@Mi>Fk0
z=s!NZeDUuWzeLb2*<-9z&VYejgDzZ)wb)8x*svTc0Ddn(3Gw?&ujU>MzUH8y&nIdT
zILR_330hj#C|JaZS&M4rw;SrZ%)TOA2(%E#TnNba_JZ#F<CvPr2+;BtIBKbX(<veB
zFFDb_4}hH%Izx!)Y7_iL(MQnPpWR!3GT8mZ2gYRgog&h;H{B7>2GX@bcwEV)XbR_T
z54sBPYF_}VuKX#Uk{xD6VRay`$eh|rJnFjKfKUDy)^Py4!+qQ2@iH+(R+?Q_%xZsL
z#lpb-25&Tw=dwM()-qE|6d6Z<`s}mxS&Dt7#Q_8w>*Wx#f%0<_G1qvW3kO2@AWAO=
z4OGdWZ>et5LS=|UY=tU1IrTN&Ar~3zh5(eZ290nBaD4#{j`)c{nkaOX`--K_hFW|4
zaV{(d6QAL=1~xWwXM@zW6|~7u${D=gb%PEgqTKZ$@KVPE&Audrp<yt8R#X~=G+p?)
zuAV>^F*A6Elzyt)7gSdv_>lFTFW=z|lhCIY3{qId00?UOt-arE_<b{m;_KC;G=!6)
zFs1mU`f$E$CiCoO{0}LVEmsi}56y)2)WgS0$DPV1g!YhmvG)^7Ry2%2RSi%a+8Xx&
z3uqRFzW?bC^uJ4%9lCmdP_yZh=hFj6+A7*6weoX=hKcldvjAeiHrqlE!(~re-_3;c
z#h_I!3`FgSJlCu$0eW;cWjDmL6EMCX>=tJ?)6>Q5!x^<h-Y8=E68To3ujOrD?#v*y
z-gXe5AV!^3BO)fg$%DqA&E8X~4GU4GEVf(9L9n*#4bj{orIpr`69yGCSoqSER7mJn
z7v%ix^!8@9_!J^*hpsTTa9lx}T3IYHy|jAqXlCg&U@*1RQuBP&*nU8hTLv0DnNS%X
z1CY|Mno-{ZyQF>91+6|j&lj!W`$CAgy-oz}W06Qg!%fv{#qF&Rn0q6Xvc!8(3qLBW
zwDBWgld%R98B7*tWnVFj%QaFEu$4+avk+f)jMt{(aom&L21*GWR)!wI4tzD^lQ0J_
zGWUdw>FK-K<ryyV$hvR3!VhvGT|e@9Fz$7e{K7Y6O{Reay7pziFC?VjUefV7wR3Ni
zkp~<P9z2_*m<R)&nFxIxhqttoyayeB+uq<LP%ALqkGTL?caI-B&+`cKQer%bLEjjJ
zia+D>&l=8CfWI$xgBvpr84N`X?5>SmN?gSA?$rKfBrB}ws+3+sJTflM@c+%#Et(2Y
z!RhP<hoAb52>LC-zxH>Va6>xT!}|o4++g%F`8{7>ev%Vgf9M_~g9$lYhRE%IYL*cG
zQG+ddY4U?aXUY!}ihn<VQ1JE6)4jh(gv$s%FBSSG-y|VYMFTzMVWZ2<$?Z9EawGjH
zo;E8K#&N;d&eitSc)UV+n>4{NI!=XMn`}G?ZLF+qWcTaY^mg&?>Sh$3=#(zBb4HZ(
zTdLFFq1f7~%qGnyar$pjlA7pG`uuu)etrIm&ZfV<oSZ#-=~qvbLs~2&n@%p`N%pZ>
ymnYi~`O>^wzt{g<<hDND{9USrHn-Bw-}|>d%Jh|Y82)~3EBX_|{^@yo6aWCZA8B3y

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 98ef75e46..d556d87ba 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -798,6 +798,10 @@ case "$MACHINE" in
         dd if=$rootdir/usr/lib/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin of="$image" \
            seek=8 conv=notrunc bs=1k
         ;;
+    a20-olinuxino-lime)
+        dd if=$rootdir/usr/lib/u-boot/A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin \
+           of="$image" seek=8 conv=notrunc bs=1k
+        ;;
 esac
 
 if $use_eatmydata ; then
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 774762a82..74dd5f0ec 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -201,6 +201,10 @@ case "$MACHINE" in
     a20_setup_boot sun7i-a20-cubietruck.dtb
     enable_serial_console ttyS0
     ;;
+    a20-olinuxino-lime)
+    a20_setup_boot sun7i-a20-olinuxino-lime.dtb
+    enable_serial_console ttyS0
+    ;;
     a20-olinuxino-lime2)
     a20_setup_boot sun7i-a20-olinuxino-lime2.dtb
     enable_serial_console ttyS0
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index 46832d9ce..0707b1abb 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -74,7 +74,6 @@ logrotate module-init-tools netbase rsyslog udev debian-archive-keyring"
 beaglebone_pkgs="linux-image-armmp u-boot-tools u-boot"
 
 # Packages needed on the Allwinner A20 devices:
-#  - Cubieboard2
 a20_pkgs="linux-image-armmp-lpae u-boot-tools u-boot u-boot-sunxi"
 
 # Packages needed for self-hosted development
@@ -96,7 +95,7 @@ case "$MACHINE" in
  --roottype btrfs \
 "
     ;;
-    cubietruck | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2)
+    cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2)
        extra_pkgs="$a20_pkgs"
        extra_opts="\
  --variant minbase \
diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index 0a77f08cb..d46e4a4ab 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -111,6 +111,17 @@ cubietruck: prep
 	$(SIGN)
 	@echo "Build complete."
 
+# build A20 OLinuXino Lime SD card image
+a20-olinuxino-lime: prep
+	$(eval ARCHITECTURE = armhf)
+	$(eval MACHINE = a20-olinuxino-lime)
+	$(eval IMAGE = $(NAME).img)
+	$(MAKE_IMAGE)
+	rm -f $(ARCHIVE)
+	$(XZ) $(IMAGE)
+	@echo ""
+	$(SIGN)
+
 # build A20 OLinuXino Lime2 SD card image
 a20-olinuxino-lime2: prep
 	$(eval ARCHITECTURE = armhf)
diff --git a/website/EN/installation.html b/website/EN/installation.html
index 35a293c4d..e730bb6c5 100644
--- a/website/EN/installation.html
+++ b/website/EN/installation.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2016-01-14 Thu 11:07 -->
+<!-- 2016-01-28 Thu 09:27 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -281,7 +281,7 @@ To build a 64bit Qemu image:
 </div>
 
 <p>
-Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime, olinuxino-lime2 and olinuxino-micro.
 </p>
 </div>
 </div>
@@ -342,6 +342,7 @@ Currently the following boards are supported:
 <li><a href="http://beagleboard.org/BLACK">Beaglebone Black</a></li>
 <li><a href="http://linux-sunxi.org/Cubietech_Cubieboard2">Cubieboard 2</a></li>
 <li><a href="https://linux-sunxi.org/Cubietruck">Cubietruck (Cubieboard 3)</a></li>
+<li><a href="https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME/open-source-hardware">olinuxino Lime</a></li>
 <li><a href="https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware">olinuxino Lime2</a></li>
 <li><a href="https://www.olimex.com/Products/OlinuXino/A20/A20-OlinuXino-MICRO/open-source-hardware">olinuxino Micro</a></li>
 </ul>
-- 
GitLab