Tag for the LUFA-120730-BETA release.LUFA-120730-BETA

git-svn-id: http://lufa-lib.googlecode.com/svn/tags/LUFA-120730-BETA@2407 d5102386-fcda-11dd-9fdb-3debd5008f28

2 files changed, 125 insertions, 120 deletions

diff --git a/BuildTests/BootloaderTest/BootloaderDeviceMap.cfg b/BuildTests/BootloaderTest/BootloaderDeviceMap.cfg
index 082b8f50..614b6b56 100644
--- a/BuildTests/BootloaderTest/BootloaderDeviceMap.cfg
+++ b/BuildTests/BootloaderTest/BootloaderDeviceMap.cfg
@@ -1,63 +1,63 @@
-#

-#             LUFA Library

-#     Copyright (C) Dean Camera, 2012.

-#

-#  dean [at] fourwalledcubicle [dot] com

-#           www.lufa-lib.org

-#

-#

-# =============================================================================

-# Bootloader configuration map script, processed with the "BootloaderTest"

-# makefile. This script file defines the targets for each LUFA bootloader,

-# which are then built as part of the build test to ensure that there are no

-# failures on all standard configurations. To add a new build target for a

-# bootloader to this script, use the format:

-#

-#    BOOTLOADER = {ARCH} : {MCU} : {BOARD} : {FLASH SIZE KB} : {BOOT SIZE KB} :

-#

-# And re-run the makefile.

-# =============================================================================

-#

-#

-# ------------ CDC Bootloader -------------

-CDC = avr8 : at90usb1287 : NONE : 128 : 8 :

-CDC = avr8 : at90usb647  : NONE :  64 : 4 :

-CDC = avr8 : at90usb1286 : NONE : 128 : 8 :

-CDC = avr8 : at90usb646  : NONE :  64 : 4 :

-CDC = avr8 : atmega32u6  : NONE :  32 : 4 :

-CDC = avr8 : atmega32u4  : NONE :  32 : 4 :

-CDC = avr8 : atmega16u4  : NONE :  16 : 4 :

-CDC = avr8 : atmega32u2  : NONE :  32 : 4 :

-CDC = avr8 : atmega16u2  : NONE :  16 : 4 :

-CDC = avr8 : atmega8u2   : NONE :   8 : 4 :

-CDC = avr8 : at90usb162  : NONE :  16 : 4 :

-CDC = avr8 : at90usb82   : NONE :   8 : 4 :

-#

-# ------------ DFU Bootloader -------------

-DFU = avr8 : at90usb1287 : NONE : 128 : 8 :

-DFU = avr8 : at90usb647  : NONE :  64 : 4 :

-DFU = avr8 : at90usb1286 : NONE : 128 : 8 :

-DFU = avr8 : at90usb646  : NONE :  64 : 4 :

-DFU = avr8 : atmega32u6  : NONE :  32 : 4 :

-DFU = avr8 : atmega32u4  : NONE :  32 : 4 :

-DFU = avr8 : atmega16u4  : NONE :  16 : 4 :

-DFU = avr8 : atmega32u2  : NONE :  32 : 4 :

-DFU = avr8 : atmega16u2  : NONE :  16 : 4 :

-DFU = avr8 : atmega8u2   : NONE :   8 : 4 :

-DFU = avr8 : at90usb162  : NONE :  16 : 4 :

-DFU = avr8 : at90usb82   : NONE :   8 : 4 :

-#

-# ------------ HID Bootloader -------------

-HID = avr8 : at90usb1287 : NONE : 128 : 4 :

-HID = avr8 : at90usb647  : NONE :  64 : 4 :

-HID = avr8 : at90usb1286 : NONE : 128 : 4 :

-HID = avr8 : at90usb646  : NONE :  64 : 4 :

-HID = avr8 : atmega32u6  : NONE :  32 : 4 :

-HID = avr8 : atmega32u4  : NONE :  32 : 4 :

-HID = avr8 : atmega16u4  : NONE :  16 : 4 :

-HID = avr8 : atmega32u2  : NONE :  32 : 2 :

-HID = avr8 : atmega16u2  : NONE :  16 : 2 :

-HID = avr8 : atmega8u2   : NONE :   8 : 2 :

-HID = avr8 : at90usb162  : NONE :  16 : 2 :

-HID = avr8 : at90usb82   : NONE :   8 : 2 :

+#
+#             LUFA Library
+#     Copyright (C) Dean Camera, 2012.
+#
+#  dean [at] fourwalledcubicle [dot] com
+#           www.lufa-lib.org
+#
+#
+# =============================================================================
+# Bootloader configuration map script, processed with the "BootloaderTest"
+# makefile. This script file defines the targets for each LUFA bootloader,
+# which are then built as part of the build test to ensure that there are no
+# failures on all standard configurations. To add a new build target for a
+# bootloader to this script, use the format:
+#
+#    BOOTLOADER = {ARCH} : {MCU} : {BOARD} : {FLASH SIZE KB} : {BOOT SIZE KB} :
+#
+# And re-run the makefile.
+# =============================================================================
+#
+#
+# ------------ CDC Bootloader -------------
+CDC = AVR8 : at90usb1287 : NONE : 128 : 8 :
+CDC = AVR8 : at90usb647  : NONE :  64 : 4 :
+CDC = AVR8 : at90usb1286 : NONE : 128 : 8 :
+CDC = AVR8 : at90usb646  : NONE :  64 : 4 :
+CDC = AVR8 : atmega32u6  : NONE :  32 : 4 :
+CDC = AVR8 : atmega32u4  : NONE :  32 : 4 :
+CDC = AVR8 : atmega16u4  : NONE :  16 : 4 :
+CDC = AVR8 : atmega32u2  : NONE :  32 : 4 :
+CDC = AVR8 : atmega16u2  : NONE :  16 : 4 :
+CDC = AVR8 : atmega8u2   : NONE :   8 : 4 :
+CDC = AVR8 : at90usb162  : NONE :  16 : 4 :
+CDC = AVR8 : at90usb82   : NONE :   8 : 4 :
+#
+# ------------ DFU Bootloader -------------
+DFU = AVR8 : at90usb1287 : NONE : 128 : 8 :
+DFU = AVR8 : at90usb647  : NONE :  64 : 4 :
+DFU = AVR8 : at90usb1286 : NONE : 128 : 8 :
+DFU = AVR8 : at90usb646  : NONE :  64 : 4 :
+DFU = AVR8 : atmega32u6  : NONE :  32 : 4 :
+DFU = AVR8 : atmega32u4  : NONE :  32 : 4 :
+DFU = AVR8 : atmega16u4  : NONE :  16 : 4 :
+DFU = AVR8 : atmega32u2  : NONE :  32 : 4 :
+DFU = AVR8 : atmega16u2  : NONE :  16 : 4 :
+DFU = AVR8 : atmega8u2   : NONE :   8 : 4 :
+DFU = AVR8 : at90usb162  : NONE :  16 : 4 :
+DFU = AVR8 : at90usb82   : NONE :   8 : 4 :
+#
+# ------------ HID Bootloader -------------
+HID = AVR8 : at90usb1287 : NONE : 128 : 4 :
+HID = AVR8 : at90usb647  : NONE :  64 : 4 :
+HID = AVR8 : at90usb1286 : NONE : 128 : 4 :
+HID = AVR8 : at90usb646  : NONE :  64 : 4 :
+HID = AVR8 : atmega32u6  : NONE :  32 : 4 :
+HID = AVR8 : atmega32u4  : NONE :  32 : 4 :
+HID = AVR8 : atmega16u4  : NONE :  16 : 4 :
+HID = AVR8 : atmega32u2  : NONE :  32 : 2 :
+HID = AVR8 : atmega16u2  : NONE :  16 : 2 :
+HID = AVR8 : atmega8u2   : NONE :   8 : 2 :
+HID = AVR8 : at90usb162  : NONE :  16 : 2 :
+HID = AVR8 : at90usb82   : NONE :   8 : 2 :
 #
\ No newline at end of file
diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 71fa21a4..e3f60d77 100644
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -1,58 +1,63 @@
-#

-#             LUFA Library

-#     Copyright (C) Dean Camera, 2012.

-#

-#  dean [at] fourwalledcubicle [dot] com

-#           www.lufa-lib.org

-#

-

-# Makefile for the bootloader build test. This

-# test attempts to build all the bootloaders

-# with all supported device configurations.

-

-# Path to the root of the LUFA tree to scan

-LUFA_ROOT_PATH    = ../..

-

-

-all: begin testbootloaders clean end

-

-begin:

-	@echo Executing build test "BootloaderTest".

-	@echo

-

-end:

-	@echo Build test "BootloaderTest" complete.

-	@echo

-	

-testbootloaders:

-	@echo "buildtest:" > BuildMakefile

-	

-	@while read line;                                         \

-	 do                                                       \

-	   build_cfg=`echo $$line | grep -v "#" | sed 's/ //g'`;  \

-	                                                          \

-	   if ( test -n "$$build_cfg" ); then                     \

-	     build_bootloader=`echo $$build_cfg | cut -d'=' -f1`; \

-		 build_cfg=`echo $$build_cfg | cut -d'=' -f2-`;       \

-		                                                      \

-	     build_arch=`echo $$build_cfg | cut -d':' -f1`;       \

-	     build_mcu=`echo $$build_cfg | cut -d':' -f2`;        \

-	     build_board=`echo $$build_cfg | cut -d':' -f3`;      \

-	     build_flashsize=`echo $$build_cfg | cut -d':' -f4`;  \

-	     build_bootsize=`echo $$build_cfg | cut -d':' -f5`;   \

-	                                                          \

-	     printf "Found bootloader configuration for bootloader '%s' (FLASH: %3s KB | BOOT: %3s KB | MCU: %12s / %4s)\n" $$build_bootloader $$build_flashsize $$build_bootsize $$build_mcu $$build_arch; \

-	                                                          \

-	     printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \

-	     printf "\tmake -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ clean\n" $$build_bootloader >> BuildMakefile; \

-	     printf "\tmake -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s elf\n\n" $$build_bootloader $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \

-	   fi;                                                    \

-	 done < BootloaderDeviceMap.cfg

-	 

-	 $(MAKE) -f BuildMakefile buildtest

-

-clean:

-	rm -f BuildMakefile

-

-%:

-	
\ No newline at end of file
+#
+#             LUFA Library
+#     Copyright (C) Dean Camera, 2012.
+#
+#  dean [at] fourwalledcubicle [dot] com
+#           www.lufa-lib.org
+#
+
+# Makefile for the bootloader build test. This
+# test attempts to build all the bootloaders
+# with all supported device configurations.
+
+# Path to the LUFA library core
+LUFA_PATH := ../../LUFA/
+
+# Build test cannot be run with multiple parallel jobs
+.NOTPARALLEL:
+
+all: begin testbootloaders clean end
+
+begin:
+	@echo Executing build test "BootloaderTest".
+	@echo
+
+end:
+	@echo Build test "BootloaderTest" complete.
+	@echo
+	
+testbootloaders:
+	@echo "buildtest:" > BuildMakefile
+	
+	@while read line;                                         \
+	 do                                                       \
+	   build_cfg=`echo $$line | grep -v "#" | sed 's/ //g'`;  \
+	                                                          \
+	   if ( test -n "$$build_cfg" ); then                     \
+	     build_bootloader=`echo $$build_cfg | cut -d'=' -f1`; \
+		 build_cfg=`echo $$build_cfg | cut -d'=' -f2-`;       \
+		                                                      \
+	     build_arch=`echo $$build_cfg | cut -d':' -f1`;       \
+	     build_mcu=`echo $$build_cfg | cut -d':' -f2`;        \
+	     build_board=`echo $$build_cfg | cut -d':' -f3`;      \
+	     build_flashsize=`echo $$build_cfg | cut -d':' -f4`;  \
+	     build_bootsize=`echo $$build_cfg | cut -d':' -f5`;   \
+	                                                          \
+	     printf "Found '%s' bootloader configuration (FLASH: %3s KB | BOOT: %3s KB | MCU: %12s / %4s)\n" $$build_bootloader $$build_flashsize $$build_bootsize $$build_mcu $$build_arch; \
+	                                                          \
+	     printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \
+	     printf "\t$(MAKE) -C $(patsubst %/,%,$(LUFA_PATH))/../Bootloaders/%s/ clean elf ARCH=%s MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s DEBUG_LEVEL=0\n\n" $$build_bootloader $$build_arch $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \
+	   fi;                                                    \
+	 done < BootloaderDeviceMap.cfg
+	 
+	 $(MAKE) -f BuildMakefile buildtest
+
+clean:
+	rm -f BuildMakefile
+
+%:
+
+.PHONY: all begin end testbootloaders clean
+
+# Include LUFA build script makefiles
+include $(LUFA_PATH)/Build/lufa_core.mk