From 275d5e8e78d59ad243c9f8474c841e5db57ed1c3 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 24 Jan 2015 03:52:50 +0000
Subject: [PATCH] alarm/uboot-sunxi to 2015.01-2

---
 alarm/uboot-sunxi/PKGBUILD | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/alarm/uboot-sunxi/PKGBUILD b/alarm/uboot-sunxi/PKGBUILD
index 1124b0322..a3fb63ff7 100644
--- a/alarm/uboot-sunxi/PKGBUILD
+++ b/alarm/uboot-sunxi/PKGBUILD
@@ -5,9 +5,9 @@ buildarch=4
 
 pkgbase=uboot-sunxi
 pkgname=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-a20-olinuxino-micro' 'uboot-a13-olinuxino-micro'
-         'uboot-a10s-olinuxino-micro' 'uboot-a10s-olinuxino-micro-lcd7')
+         'uboot-a10s-olinuxino-micro' 'uboot-a10s-olinuxino-micro-lcd7' 'uboot-cubieboard')
 pkgver=2015.01
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -24,7 +24,8 @@ md5sums=('7f08dc9e98a71652bd6968888ed6ec95'
          'b05eae006e4e35176ee3032eba1c4663'
          '021623a04afd29ac3f368977140cfbfd')
 
-boards=('Cubieboard2'
+boards=('Cubieboard'
+        'Cubieboard2'
         'Cubietruck'
         'A20-OLinuXino_MICRO'
         'A13-OLinuXinoM'
@@ -54,6 +55,21 @@ build() {
   tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt ../boot.scr
 }
 
+package_uboot-cubieboard() {
+  pkgdesc="U-Boot for Cubieboard"
+  install=${pkgbase}.install
+  provides=('uboot-sunxi')
+  conflicts=('uboot-sunxi')
+
+  install -d "${pkgdir}"/boot
+  install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
+
+  fex2bin sunxi-boards/sys_config/a10/cubieboard.fex "${pkgdir}"/boot/script.bin
+  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
+  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
+  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
+}
+
 package_uboot-cubieboard2() {
   pkgdesc="U-Boot for Cubieboard 2"
   install=${pkgbase}.install