From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Jul 2013 15:18:31 +0000 (+0000)
Subject: u-boot: Update to 2013.07rc2.
X-Git-Tag: pango~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd25a4232ba04720920d4a80d9b2f0682a7acc61;p=people%2Fstevee%2Fipfire-3.x.git

u-boot: Update to 2013.07rc2.

Add u-boot.kwb for Dreamplug and support for
Wandboard Solo and Wandboard Dual.
---

diff --git a/u-boot/targets b/u-boot/targets
index 8f2c60193..18cf5b134 100644
--- a/u-boot/targets
+++ b/u-boot/targets
@@ -1,4 +1,6 @@
 # HOST_ARCH		platform	targets
 # --------------------------------------------
-armv5tel		dreamplug	u-boot.bin
+armv5tel		dreamplug	u-boot.bin u-boot.kwb
 armv7hl			omap4_panda	u-boot.bin u-boot.img
+armv7hl			wandboard_solo	u-boot.imx
+armv7hl			wandboard_dl	u-boot.imx
diff --git a/u-boot/u-boot.nm b/u-boot/u-boot.nm
index 40997781b..517c262c6 100644
--- a/u-boot/u-boot.nm
+++ b/u-boot/u-boot.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = u-boot
-version    = 2013.04
+version    = 2013.07
 rc         = 2
 release    = 0.1.rc%{rc}
 thisapp    = %{name}-%{version}-rc%{rc}
@@ -33,42 +33,37 @@ build
 			# Skip all other architectures.
 			[ "${arch}" = "%{DISTRO_ARCH}" ] || continue
 
-			builddir="$(pwd)/build-${platform}"
-			mkdir -p ${builddir}
+			make CROSS_COMPILE="" ${platform}_config
+			make HOSTCC="gcc %{CFLAGS}" CROSS_COMPILE="" all ${targets}
 
-			make CROSS_COMPILE="" O=${builddir} ${platform}_config
-			make HOSTCC="gcc %{CFLAGS}" CROSS_COMPILE="" O=${builddir}
-		done < %{DIR_SOURCE}/targets
-
-		# Build tools.
-		# Need to create a config because the tools won't build without.
-		make sheevaplug_config
-
-		make tools HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true" CROSS_COMPILE=""
-		make env HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true"
-	end
-
-	install
-		while read arch platform targets; do
-			# Skip all other architectures.
-			[ "${arch}" = "%{DISTRO_ARCH}" ] || continue
-
-			builddir="build-${platform}"
+			# install
 			installdir="%{BUILDROOT}/usr/lib/%{name}/${platform}"
 			mkdir -pv ${installdir}
 
 			for target in ${targets}; do
-				install -D -m 644 ${builddir}/${target} ${installdir}
+				install -D -m 644 ${target} ${installdir}
 			done
-			if [ -e "${builddir}/MLO" ]; then
-				install -D -m 644 ${builddir}/MLO ${installdir}
+			if [ -e "MLO" ]; then
+				install -D -m 644 MLO ${installdir}
 			fi
-			for f in ${builddir}/spl/*.bin; do
+			for f in spl/*.bin; do
 				[ -e "${f}" ] || continue
 				install -D -m 644 ${f} ${installdir}
 			done
+
+			# Clean out the build environment.
+			make distclean
 		done < %{DIR_SOURCE}/targets
 
+		# Build tools.
+		# Need to create a config because the tools won't build without.
+		make sheevaplug_config
+
+		make tools HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true" CROSS_COMPILE=""
+		make env HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true"
+	end
+
+	install
 		# Install tools.
 		mkdir -pv %{BUILDROOT}/usr/bin %{BUILDROOT}/usr/share/man/man1
 		install -p -m 0755 tools/mkimage %{BUILDROOT}/usr/bin