Merge pull request #866 from wirewc/master

Added support for the A20-OLiniXino_Micro in the PKGBUILD and added the ...

alarm/uboot-sunxi/PKGBUILD

@@ -5,9 +5,9 @@ buildarch=4
 
 pkgbase=uboot-sunxi
 pkgname=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-iteaduino_plus_a10' 'uboot-iteaduino_plus_a20'
-         'uboot-hackberry')
+         'uboot-hackberry' 'uboot-a20-olinuxino_micro')
 pkgver=2014.04
-pkgrel=3
+pkgrel=4
 arch=('armv7h')
 url="https://github.com/linux-sunxi/u-boot-sunxi/tree/sunxi-current"
 license=('GPL')
@@ -20,7 +20,9 @@ source=("https://github.com/linux-sunxi/u-boot-sunxi/archive/${_commit}.tar.gz"
         'cubietruck.fex' 'cubietruck.env'
         'iteaduino_plus_a10.fex' 'iteaduino_plus_a10.env'
         'iteaduino_plus_a20.fex' 'iteaduino_plus_a20.env'
-        'hackberry.fex' 'hackberry.env')
+        'hackberry.fex' 'hackberry.env'
+        'a20-olinuxino_micro.fex' 'a20-olinuxino_micro.env')
+
 md5sums=('8e4f2a2c1384f31eca5d3864b86e8351'
          'e1a60073a996b95f3e3f3fd07239e2e6'
          '36c04988cecd53151f3f5ff5c48d76a9'
@@ -32,7 +34,9 @@ md5sums=('8e4f2a2c1384f31eca5d3864b86e8351'
          '4b85ce18f33c9b4a6338fa973df44f54'
          'd41d8cd98f00b204e9800998ecf8427e'
          'd19b25217059a2594c53ffe0eb1e0a12'
-         'd41d8cd98f00b204e9800998ecf8427e')
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '2cac23939b761d1ea668faa2c68b3688'
+         'd41d8cd98f00b204e9800998ecf8427e'  )
 
 prepare() {
   cd u-boot-sunxi-${_commit}
@@ -46,11 +50,11 @@ build() {
   unset CXXFLAGS
   unset LDFLAGS
 
-  for i in Cubieboard2 Cubietruck Iteaduino_Plus_A10 Iteaduino_Plus_A20 Hackberry; do
+  for i in Cubieboard2 Cubietruck Iteaduino_Plus_A10 Iteaduino_Plus_A20 Hackberry A20-OLinuXino_MICRO; do
     mkdir ../bin_${i}
     make distclean
     make ${i}_config
-    make
+    make 
     mv u-boot-sunxi-with-spl.bin ../bin_${i}
   done
 }
@@ -58,7 +62,7 @@ build() {
 package_uboot-cubieboard2() {
   pkgdesc="U-Boot for Cubieboard 2"
   install=${pkgbase}.install
-  conflicts=('uboot-cubietruck' 'uboot-iteaduino_plus_a10' 'uboot-iteaduino_plus_a20' 'uboot-hackberry')
+  conflicts=('uboot-cubietruck' 'uboot-iteaduino_plus_a10' 'uboot-iteaduino_plus_a20' 'uboot-hackberry' 'uboot-a20-olinuxino_micro')
 
   mkdir -p "${pkgdir}"/boot
   cp bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -70,7 +74,7 @@ package_uboot-cubieboard2() {
 package_uboot-cubietruck() {
   pkgdesc="U-Boot for Cubietruck"
   install=${pkgbase}.install
-  conflicts=('uboot-cubieboard2' 'uboot-iteaduino_plus_a10' 'uboot-iteaduino_plus_a20' 'uboot-hackberry')
+  conflicts=('uboot-cubieboard2' 'uboot-iteaduino_plus_a10' 'uboot-iteaduino_plus_a20' 'uboot-hackberry' 'uboot-a20-olinuxino_micro')
 
   mkdir -p "${pkgdir}"/boot
   cp bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -82,7 +86,7 @@ package_uboot-cubietruck() {
 package_uboot-iteaduino_plus_a10() {
   pkgdesc="U-Boot for Iteaduino Plus A10"
   install=${pkgbase}.install
-  conflicts=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-iteaduino_plus_a20' 'uboot-hackberry') 
+  conflicts=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-iteaduino_plus_a20' 'uboot-hackberry' 'uboot-a20-olinuxino_micro') 
 
   mkdir -p "${pkgdir}"/boot
   cp bin_Iteaduino_Plus_A10/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -94,7 +98,7 @@ package_uboot-iteaduino_plus_a10() {
 package_uboot-iteaduino_plus_a20() {
   pkgdesc="U-Boot for Iteaduino Plus A20"
   install=${pkgbase}.install
-  conflicts=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-iteaduino_plus_a10' 'uboot-hackberry')
+  conflicts=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-iteaduino_plus_a10' 'uboot-hackberry' 'uboot-a20-olinuxino_micro')
 
   mkdir -p "${pkgdir}"/boot
   cp bin_Iteaduino_Plus_A20/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -106,7 +110,7 @@ package_uboot-iteaduino_plus_a20() {
 package_uboot-hackberry() {
   pkgdesc="U-Boot for Hackberry"
   install=${pkgbase}.install
-  conflicts=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-iteaduino_plus_a10' 'uboot-iteaduino_plus_a20')
+  conflicts=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-iteaduino_plus_a10' 'uboot-iteaduino_plus_a20' 'uboot-a20-olinuxino_micro')
 
   mkdir -p "${pkgdir}"/boot
   cp bin_Hackberry/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -114,3 +118,17 @@ package_uboot-hackberry() {
   fex2bin hackberry.fex "${pkgdir}"/boot/script.bin
   cp hackberry.env "${pkgdir}"/boot/uEnv.txt
 }
+
+package_uboot-a20-olinuxino_micro() {
+  pkgdesc="U-Boot for A20 OLinuXino Micro"
+  install=${pkgbase}.install
+  conflicts=('uboot-cubieboard2' 'uboot-cubietruck' 'uboot-iteaduino_plus_a10' 'uboot-iteaduino_plus_a20' 'uboot-hackberry')
+
+  mkdir -p "${pkgdir}"/boot
+  cp bin_A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  fex2bin a20-olinuxino_micro.fex "${pkgdir}"/boot/script.bin
+  cp a20-olinuxino_micro.env "${pkgdir}"/boot/uEnv.txt
+}
+
+