From subversion@balloonboard.org Thu Mar 11 18:21:06 2010
Received: from wookey by stoneboat.aleph1.co.uk with local (Exim 4.69)
	(envelope-from <subversion@balloonboard.org>) id 1Npn0M-0006X8-1s
	for balloon-svn@balloonboard.org; Thu, 11 Mar 2010 18:21:06 +0000
Date: Thu, 11 Mar 2010 18:21:06 +0000
To: balloon-svn@balloonboard.org
From: subversion@balloonboard.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1Npn0M-0006X8-1s@stoneboat.aleph1.co.uk>
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: subversion@balloonboard.org
X-SA-Exim-Scanned: No (on stoneboat.aleph1.co.uk);
	SAEximRunCond expanded to false
Subject: [Balloon-svn] r1020 - balloon/trunk/bootldr
X-BeenThere: balloon-svn@balloonboard.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: <balloon-svn.balloonboard.org>
List-Unsubscribe: <http://balloonboard.org/cgi-bin/mailman/options/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=unsubscribe>
List-Archive: <http://balloonboard.org/lurker/list/balloon-svn.html>
List-Post: <mailto:balloon-svn@balloonboard.org>
List-Help: <mailto:balloon-svn-request@balloonboard.org?subject=help>
List-Subscribe: <http://balloonboard.org/cgi-bin/mailman/listinfo/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Mar 2010 18:21:06 -0000

Author: wookey
Date: 2010-03-11 18:21:05 +0000 (Thu, 11 Mar 2010)
New Revision: 1020

Modified:
   balloon/trunk/bootldr/Makefile
   balloon/trunk/bootldr/Makefile-level2
Log:
Stop building balloon2 variants of bootldr. They probably stopped
working some time back.
Leave use of 'VERSION_SPECIAL' for bootloader variants


Modified: balloon/trunk/bootldr/Makefile
===================================================================
--- balloon/trunk/bootldr/Makefile	2010-03-11 18:17:06 UTC (rev 1019)
+++ balloon/trunk/bootldr/Makefile	2010-03-11 18:21:05 UTC (rev 1020)
@@ -7,7 +7,7 @@
 
 BUILDD=$(BUILDDIR)/bootldr
 XSCALE_IMAGES=$(BUILDD)/bootldrpxa.small $(BUILDD)/bootldrpxa.fast
-STRONGARM_IMAGES=$(BUILDD)/bootldr.small $(BUILDD)/bootldr.fast
+#STRONGARM_IMAGES=$(BUILDD)/bootldr.small $(BUILDD)/bootldr.fast
 
 #nobble bootldr-tools dep until sys/types eabi issue is solved
 #all: bootldr-tools $(XSCALE_IMAGES) $(STRONGARM_IMAGES)
@@ -17,13 +17,13 @@
 $(BUILDD)/bootldrpxa.small: Makefile-level2 
 	install -d $(BUILDD)
 	$(MAKE) -f Makefile-level2 clean
-	$(MAKE) $(MAKEOPTS) -f Makefile-level2 VERSION_SPECIAL=loon3 CONFIG_ARCH=PXA CONFIG_BALLOON_SMALL=y
+	$(MAKE) $(MAKEOPTS) -f Makefile-level2 CONFIG_ARCH=PXA CONFIG_BALLOON_SMALL=y
 	install bootldrpxa.small* $(BUILDD)
 
 # loon 3 large (fast)
 $(BUILDD)/bootldrpxa.fast: Makefile-level2
 	$(MAKE) -f Makefile-level2 clean
-	$(MAKE) $(MAKEOPTS) -f Makefile-level2 VERSION_SPECIAL=loon3 CONFIG_ARCH=PXA CONFIG_BALLOON_SMALL=n
+	$(MAKE) $(MAKEOPTS) -f Makefile-level2 CONFIG_ARCH=PXA CONFIG_BALLOON_SMALL=n
 	install bootldrpxa.fast* $(BUILDD)
 
 # loon 2 small

Modified: balloon/trunk/bootldr/Makefile-level2
===================================================================
--- balloon/trunk/bootldr/Makefile-level2	2010-03-11 18:17:06 UTC (rev 1019)
+++ balloon/trunk/bootldr/Makefile-level2	2010-03-11 18:21:05 UTC (rev 1020)
@@ -20,7 +20,7 @@
 VERSION_MAJOR = 3
 VERSION_MINOR = 1
 VERSION_MICRO = 0
-VERSION_SPECIAL= loon3
+VERSION_SPECIAL= 
 
 cvs_ver = BOOTLDR_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO}