From 795f7750abb484bf2e722627b44fd113650bab2a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Thu, 26 Nov 2015 17:40:37 +0000
Subject: [PATCH] Tidying

---
 src/freedombone-image-customise | 1 -
 src/freedombone-image-make      | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 7e1268cf..a2e0e5a0 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -338,7 +338,6 @@ chroot "$rootdir" apt-get install -y sudo git dialog toilet build-essential open
 chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name
-chroot "$rootdir" apt-get install -y u-boot-sunxi
 
 chroot "$rootdir" /bin/bash -x <<EOF
 git clone https://github.com/bashrc/freedombone /root/freedombone
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index f76024d1..7448e3e4 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -65,10 +65,8 @@ 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:
-#  - Cubietruck
-#  - A20 OLinuXino LIME2
-#  - A20 OLinuXino MICRO
-a20_pkgs="linux-image-armmp-lpae u-boot-tools u-boot"
+#  - Cubieboard2
+a20_pkgs="linux-image-armmp-lpae u-boot-tools u-boot u-boot-sunxi"
 
 # Packages needed for self-hosted development
 dev_pkgs="build-essential devscripts make man-db emacs org-mode git mercurial"
@@ -89,7 +87,7 @@ case "$MACHINE" in
  --roottype btrfs \
 "
     ;;
-    cubieboard2 | cubietruck | a20-olinuxino-lime2 | a20-olinuxino-micro)
+    cubieboard2)
        extra_pkgs="$a20_pkgs"
        extra_opts="\
  --variant minbase \