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}