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 8f2c60193cbab65447e4df5cb299003df6a37c63..18cf5b1342dd0dcd6263ea859632710d6388c7b4 100644 (file)
--- 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 40997781b0f8dfb888ebc67e72180a12933495d2..517c262c6fa70db238676943bf9911398a0d5362 100644 (file)
--- 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