main/u-boot: upgrade to 2016.07

- use builddir and default prepare
- remove upstreamed patches
- update wandboard instructions for the SPL image flashing
- add rpi3 32-bit image to build

1 files changed, 16 insertions, 39 deletions

diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD
index f7387ed8d0..e10d223f49 100644
--- a/main/u-boot/APKBUILD
+++ b/main/u-boot/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=u-boot
-pkgver=2015.04
-pkgrel=1
+pkgver=2016.07
+pkgrel=0
 pkgdesc="Bootloader for ARM"
 url="http://www.denx.de/wiki/U-Boot/"
 arch="armhf"
@@ -14,20 +14,17 @@ makedepends="$depends_dev bc"
 install=""
 subpackages=""
 source="ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2
-	distroconfig-beaglebone.patch
-	distroconfig-wandboard.patch
-	include-sys-types.patch
 	README.txt
 	"
 
 _srcdir="$srcdir"/u-boot-${pkgver//_/-}
-_builddir="$srcdir"/build
+builddir="$srcdir"/build
 
 board_configs="
 	beagleboard:am335x_boneblack
 	cubieboard:Cubieboard,Cubieboard2
-	raspberrypi:rpi,rpi_2
-	wandboard:wandboard_solo,wandboard_dl,wandboard_quad
+	raspberrypi:rpi,rpi_2,rpi_3_32b
+	wandboard:wandboard
 	"
 
 for board_config in $board_configs; do
@@ -35,16 +32,6 @@ for board_config in $board_configs; do
 done
 depends="$subpackages"
 
-prepare() {
-	local i
-	cd "$_srcdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
 build() {
 	cd "$_srcdir"
 	touch include/config.h
@@ -56,9 +43,8 @@ build() {
 		local configs="${board_config#*:}"
 		for board in ${configs//,/ }; do
 			msg "Building u-boot for $board"
-			export BUILD_DIR="$_builddir"/$board
+			export BUILD_DIR="$builddir"/$board
 			mkdir -p "$BUILD_DIR"
-			make distclean
 			make O="$BUILD_DIR" ${board}_config || return 1
 			make O="$BUILD_DIR" all || return 1
 		done
@@ -66,13 +52,13 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	mkdir -p "$pkgdir"/usr/share/$pkgname
 	install "$srcdir"/README.txt "$pkgdir"/usr/share/$pkgname/README.txt
 }
 
 _split_boards() {
-	cd "$_builddir"
+	cd "$builddir"
 	pkgdesc="u-boot for $1"
 	depends=""
 	shift
@@ -80,9 +66,9 @@ _split_boards() {
 	for board; do
 		msg "Including board $board"
 		mkdir -p "$subpkgdir"/usr/share/$pkgname/$board
-		export BUILD_DIR="$_builddir"/$board
+		export BUILD_DIR="$builddir"/$board
 		local ok=no
-		for image in MLO u-boot.imx u-boot.img; do
+		for image in MLO SPL u-boot.img; do
 			if [ -e "$BUILD_DIR"/$image ]; then
 				cp "$BUILD_DIR"/$image "$subpkgdir"/usr/share/$pkgname/$board \
 					|| return 1
@@ -102,18 +88,9 @@ for board_config in $board_configs; do
 	eval "${board}() { _split_boards $board ${configs//,/ }; }"
 done
 
-md5sums="570bdc2c47270c2a98ca60ff6c5c74cd  u-boot-2015.04.tar.bz2
-a5b2aab8f3613e6f4154714b16ea9ad3  distroconfig-beaglebone.patch
-880f99276de9722b8d85d03a06784d5b  distroconfig-wandboard.patch
-2c144ed08a9aab244c0d8ea45e578ce5  include-sys-types.patch
-8880da2612846147eafb65b271934af9  README.txt"
-sha256sums="0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60  u-boot-2015.04.tar.bz2
-4a49c939184c25f216b35e800669874a46354f805218a91b1db2bb27aa979310  distroconfig-beaglebone.patch
-fc4b571e840e171f6fb6f4923697cd0768eca3b52aac912b87dfe22f61b0c753  distroconfig-wandboard.patch
-ac7fc4678aa6018ae8730536ab55ed1e1d2bc93f699a25f8bd4504132cb27302  include-sys-types.patch
-5d6e33e775e63acccde42d784348cd760b75052749cbc2ee1196b6e4ef64f78c  README.txt"
-sha512sums="e50a3d7e44bf588a7cf8e28cdf3342bc38bd1bf55231d579c2501b75386cfff0fbc7a34648d893971e0095510c9d582b7180427832cb78470b4e7af2ce0e3646  u-boot-2015.04.tar.bz2
-e840c2928afdab14442fe276a934d5d3ee615fdf32370819a1c988bf2dba99f27ccf479943f664aadaa14fbf48841e4d7d22973bb911db2d77f13aa2b4c40f88  distroconfig-beaglebone.patch
-ce22043cfe65ba3a09f965dbf69985345fa0d56ef093703a595fde2dc3cb1ddcf1012e2fdcd56eed216de2bd8b3ec3a8de08266d70ad373cf33faa79d94ad93f  distroconfig-wandboard.patch
-bb237aceacc0470c12778559fb3c7b1b8e9481f5113743ca76937d1d0052f1639c2da1d0b34069f73311aac44f9dcf628241d9322912ea7e8bd2c440a1d121bb  include-sys-types.patch
-578c48223d4f355a7e59afd4a1bbc266c06bd422fd264035c1cdedfa812098b61880d6d9d24503e4cb6a9d799a3929d9619dcadeb1f88f1f686ec94ef5b9fe44  README.txt"
+md5sums="425a3fa610a7d972e5092a0e92276c70  u-boot-2016.07.tar.bz2
+a15f53ccac7769614b1ee47971b27218  README.txt"
+sha256sums="974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253  u-boot-2016.07.tar.bz2
+286e3df4e9c682d7b41bbed610ec4ac8894129697816dfce1c88b848ab969d89  README.txt"
+sha512sums="fa76dbd7e654ff9e4b3166162be6c0a77ecf2eb2a952b4865df3c818ebcdca7e2bb75e5ba19bf0346000c3d185888552193bb74510b115426cfe444b78efd3ef  u-boot-2016.07.tar.bz2
+25ced657357acb80a6c2f064e7ad6c9497a8a52f72c366e6f362824e9453588dbbef392966cfa04d4d7c13c21a65b53cd43d306da0c54449622922c8542f2a43  README.txt"