[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 67ae211c33e8734f14e0fc5a2074fcf1ff232618

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3674 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  67ae211c33e8734f14e0fc5a2074fcf1ff232618 (commit)
      from  53fd781077944d04e9d4d13671e18baf8993a776 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 67ae211c33e8734f14e0fc5a2074fcf1ff232618
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Dec 3 00:29:50 2012 +0100

    u-boot: Update to 2012.10.
    
    Remove all versions we currently do not support.
    
    That leaves us with dreamplug and Pandaboard.

-----------------------------------------------------------------------

Summary of changes:
 u-boot/targets   | 14 +++-----------
 u-boot/u-boot.nm | 22 +++++++++++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

Difference in files:
diff --git a/u-boot/targets b/u-boot/targets
index f6fad92..8f2c601 100644
--- a/u-boot/targets
+++ b/u-boot/targets
@@ -1,12 +1,4 @@
-# HOST_ARCH		platform	target
+# HOST_ARCH		platform	targets
 # --------------------------------------------
-armv5tel		dockstar	u-boot.kwb
-# Dreamplug is not supported by this version of uboot.
-#armv5tel		dreamplug	u-boot.kwb
-armv5tel		guruplug	u-boot.kwb
-armv5tel		openrd_ultimate	u-boot.kwb
-armv5tel		sheevaplug	u-boot.kwb
-armv7hl			efikamx		u-boot.imx
-armv7hl			igep0020	u-boot.bin
-armv7hl			omap3_beagle	u-boot.bin
-armv7hl			omap4_panda	u-boot.bin
+armv5tel		dreamplug	u-boot.bin
+armv7hl			omap4_panda	u-boot.bin u-boot.img
diff --git a/u-boot/u-boot.nm b/u-boot/u-boot.nm
index 0847564..fc04ab9 100644
--- a/u-boot/u-boot.nm
+++ b/u-boot/u-boot.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = u-boot
-version    = 2011.09
+version    = 2012.10
 release    = 1
 sup_arches = armv5tel armv7hl
 
@@ -23,15 +23,15 @@ sources    = %{thisapp}.tar.bz2
 
 build
 	build
-		while read arch platform target; do
+		while read arch platform targets; do
 			# Skip all other architectures.
 			[ "${arch}" = "%{DISTRO_ARCH}" ] || continue
 
 			builddir="$(pwd)/build-${platform}"
 			mkdir -p ${builddir}
 
-			make O=${builddir} ${platform}_config
-			make O=${builddir} ${builddir}/${target}
+			make CROSS_COMPILE="" O=${builddir} ${platform}_config
+			make HOSTCC="gcc %{CFLAGS}" CROSS_COMPILE="" O=${builddir}
 		done < %{DIR_SOURCE}/targets
 
 		# Build tools.
@@ -43,7 +43,7 @@ build
 	end
 
 	install
-		while read arch platform target; do
+		while read arch platform targets; do
 			# Skip all other architectures.
 			[ "${arch}" = "%{DISTRO_ARCH}" ] || continue
 
@@ -51,8 +51,16 @@ build
 			installdir="%{BUILDROOT}/usr/lib/%{name}/${platform}"
 			mkdir -pv ${installdir}
 
-			install -D -m 644 ${builddir}/${target} ${installdir}
-			install -D -m 644 ${builddir}/u-boot ${installdir}/uboot.elf
+			for target in ${targets}; do
+				install -D -m 644 ${builddir}/${target} ${installdir}
+			done
+			if [ -e "${builddir}/MLO" ]; then
+				install -D -m 644 ${builddir}/MLO ${installdir}
+			fi
+			for f in ${builddir}/spl/*.bin; do
+				[ -e "${f}" ] || continue
+				install -D -m 644 ${f} ${installdir}
+			done
 		done < %{DIR_SOURCE}/targets
 
 		# Install tools.


hooks/post-receive
--
IPFire 3.x development tree