From 5191a5c292dcb770b6b51ffb259ce5cf2d0d1a7c Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 19 Sep 2019 10:43:11 +0200
Subject: build uboot-sunxi on armv7h

---
 uboot-sunxi/PKGBUILD | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/uboot-sunxi/PKGBUILD b/uboot-sunxi/PKGBUILD
index 0b5a713fd..619fe42d2 100644
--- a/uboot-sunxi/PKGBUILD
+++ b/uboot-sunxi/PKGBUILD
@@ -1,5 +1,6 @@
-# Maintainer: Christopher Reimer <mail+aur[at]c-reimer[dot]de>
-# Former Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
+# Maintainer:  Erich Eckner <arch at eckner dot net>
+# Contributor: Christopher Reimer <mail+aur[at]c-reimer[dot]de>
+# Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 
 pkgbase=uboot-sunxi
 pkgname=('uboot-a10-olinuxino-lime'
@@ -18,10 +19,10 @@ pkgname=('uboot-a10-olinuxino-lime'
          'uboot-pcduino3-nano')
 pkgver=2019.07
 pkgrel=1
-arch=('any')
+arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
-makedepends=('arm-none-eabi-gcc' 'bc' 'dtc' 'python2')
+makedepends=('git' 'bc' 'dtc' 'python2')
 backup=(boot/boot.txt boot/boot.scr)
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         'boot.txt'
@@ -60,15 +61,15 @@ build() {
     mkdir ../bin_${i}
     make distclean
     make ${i}_config
-    make CROSS_COMPILE=arm-none-eabi- EXTRAVERSION=-${pkgrel}
+    echo 'CONFIG_IDENT_STRING=" Arch Linux ARM"' >> .config
+    make EXTRAVERSION=-${pkgrel}
     mv u-boot-sunxi-with-spl.bin ../bin_${i}
   done
 
-  tools/mkimage -A arm -O linux -T script -C none -d ../boot.txt ../boot.scr
+  tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt ../boot.scr
 }
 
 package_uboot-a10-olinuxino-lime() {
-  arch=('armv7h')
   pkgdesc="U-Boot for A10 OLinuXino Lime"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -83,7 +84,6 @@ package_uboot-a10-olinuxino-lime() {
 }
 
 package_uboot-a10s-olinuxino-micro() {
-  arch=('armv7h')
   pkgdesc="U-Boot for A10s OLinuXino Micro"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -98,7 +98,6 @@ package_uboot-a10s-olinuxino-micro() {
 }
 
 package_uboot-a13-olinuxino() {
-  arch=('armv7h')
   pkgdesc="U-Boot for A13 OLinuXino"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -113,7 +112,6 @@ package_uboot-a13-olinuxino() {
 }
 
 package_uboot-a13-olinuxino-micro() {
-  arch=('armv7h')
   pkgdesc="U-Boot for A13 OLinuXino Micro"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -128,7 +126,6 @@ package_uboot-a13-olinuxino-micro() {
 }
 
 package_uboot-a20-olinuxino-lime() {
-  arch=('armv7h')
   pkgdesc="U-Boot for A20 OLinuXino Lime"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -143,7 +140,6 @@ package_uboot-a20-olinuxino-lime() {
 }
 
 package_uboot-a20-olinuxino-lime2() {
-  arch=('armv7h')
   pkgdesc="U-Boot for A20 OLinuXino Lime2"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -158,7 +154,6 @@ package_uboot-a20-olinuxino-lime2() {
 }
 
 package_uboot-a20-olinuxino-micro() {
-  arch=('armv7h')
   pkgdesc="U-Boot for A20 OLinuXino Micro"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -173,7 +168,6 @@ package_uboot-a20-olinuxino-micro() {
 }
 
 package_uboot-bananapi() {
-  arch=('armv7h')
   pkgdesc="U-Boot for BananaPi"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -188,7 +182,6 @@ package_uboot-bananapi() {
 }
 
 package_uboot-cubieboard() {
-  arch=('armv7h')
   pkgdesc="U-Boot for Cubieboard"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -203,7 +196,6 @@ package_uboot-cubieboard() {
 }
 
 package_uboot-cubieboard2() {
-  arch=('armv7h')
   pkgdesc="U-Boot for Cubieboard 2"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -218,7 +210,6 @@ package_uboot-cubieboard2() {
 }
 
 package_uboot-cubietruck() {
-  arch=('armv7h')
   pkgdesc="U-Boot for Cubietruck"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -233,7 +224,6 @@ package_uboot-cubietruck() {
 }
 
 package_uboot-pcduino() {
-  arch=('armv7h')
   pkgdesc="U-Boot for pcDuino"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -248,7 +238,6 @@ package_uboot-pcduino() {
 }
 
 package_uboot-pcduino3() {
-  arch=('armv7h')
   pkgdesc="U-Boot for pcDuino3"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
@@ -263,7 +252,6 @@ package_uboot-pcduino3() {
 }
 
 package_uboot-pcduino3-nano() {
-  arch=('armv7h')
   pkgdesc="U-Boot for pcDuino3 Nano"
   install=${pkgbase}.install
   provides=('uboot-sunxi')
-- 
cgit v1.2.3-70-g09d2