Commit for the 090810 release.

[pub/USBasp.git] / Projects / Benito / makefile

diff --git a/Projects/Benito/makefile b/Projects/Benito/makefile
index a785788..227012b 100644 (file)
--- a/Projects/Benito/makefile
+++ b/Projects/Benito/makefile
@@ -66,7 +66,7 @@ MCU = at90usb162
 # Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r
-BOARD  = USBKEY\r
+BOARD  = USER\r
 \r
 \r
 # Processor frequency.\r
@@ -126,7 +126,7 @@ LUFA_PATH = ../../
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
-LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 \r
@@ -469,7 +469,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 \r
 \r
 # Default target.\r
-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end\r
+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end\r
 \r
 # Change the build target to build a HEX file or a library.\r
 build: elf hex eep lss sym\r
@@ -512,27 +512,29 @@ sizeafter:
        @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \\r
        2>/dev/null; echo; fi\r
 \r
-checkhooks: build\r
+showeventhooks: build\r
        @echo\r
-       @echo ------- Unhooked LUFA Events -------\r
+       @echo -------- Unhooked LUFA Events --------\r
        @$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \\r
                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \\r
                           echo "(None)"\r
-       @echo ------------------------------------\r
+       @echo --------------------------------------\r
 \r
-checklibmode:\r
+showliboptions:\r
        @echo\r
-       @echo ----------- Library Mode -----------\r
-       @$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \\r
-                 | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \\r
-                 || echo "No specific mode (both device and host mode allowable)."\r
-       @echo ------------------------------------\r
+       @echo ---- Compile Time Library Options ----\r
+       @for i in $(LUFA_OPTS:-D%=%); do \\r
+               echo $$i; \\r
+       done\r
+       @echo --------------------------------------\r
 \r
-checkboard:\r
+showtarget:\r
        @echo\r
-       @echo ---------- Selected Board ----------\r
-       @echo Selected board model is $(BOARD).\r
-       @echo ------------------------------------\r
+       @echo --------- Target Information ---------\r
+       @echo AVR Model: $(MCU)\r
+       @echo Board:     $(BOARD)\r
+       @echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master\r
+       @echo --------------------------------------\r
        \r
 # Display compiler version information.\r
 gccversion : \r
@@ -544,26 +546,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep\r
        $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)\r
 \r
-flip: $(TARGET).hex\r
-       batchisp -hardware usb -device $(MCU) -operation erase f\r
-       batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program\r
-       batchisp -hardware usb -device $(MCU) -operation start reset 0\r
-\r
-dfu: $(TARGET).hex\r
-       dfu-programmer $(MCU) erase\r
-       dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex\r
-       dfu-programmer $(MCU) reset\r
-\r
-flip-ee: $(TARGET).hex $(TARGET).eep\r
-       copy $(TARGET).eep $(TARGET)eep.hex\r
-       batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase\r
-       batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program\r
-       batchisp -hardware usb -device $(MCU) -operation start reset 0\r
-\r
-dfu-ee: $(TARGET).hex $(TARGET).eep\r
-       dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep\r
-       dfu-programmer $(MCU) reset\r
-\r
 \r
 # Generate avr-gdb config/init file which does the following:\r
 #     define the reset signal, load the target file, connect to target, and set \r
@@ -738,8 +720,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 \r
 \r
 # Listing of phony targets.\r
-.PHONY : all checkhooks checklibmode checkboard   \\r
-begin finish end sizebefore sizeafter gccversion  \\r
-build elf hex eep lss sym coff extcoff clean      \\r
-clean_list clean_binary program debug gdb-config  \\r
-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \\r
+begin finish end sizebefore sizeafter gccversion build \\r
+elf hex eep lss sym coff extcoff program clean debug   \\r
+clean_list clean_binary gdb-config doxygen dfu flip    \\r
+flip-ee dfu-ee
\ No newline at end of file