Change project makefiles so that the current target settings and not just the board...

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

diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index dda15ac..b308d83 100644 (file)
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/makefile
@@ -473,7 +473,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 
 
 # Default target.
-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end
+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end
 
 # Change the build target to build a HEX file or a library.
 build: elf hex eep lss sym
@@ -516,27 +516,29 @@ sizeafter:
        @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
        2>/dev/null; echo; fi
 
-checkhooks: build
+showeventhooks: build
        @echo
-       @echo ------- Unhooked LUFA Events -------
+       @echo -------- Unhooked LUFA Events --------
        @$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \
                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \
                           echo "(None)"
-       @echo ------------------------------------
+       @echo --------------------------------------
 
-checklibmode:
+showliboptions:
        @echo
-       @echo ----------- Library Mode -----------
-       @$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \
-                 | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \
-                 || echo "No specific mode (both device and host mode allowable)."
-       @echo ------------------------------------
+       @echo ---- Compile Time Library Options ----
+       @for i in $(LUFA_OPTS:-D%=%); do \
+               echo $$i; \
+       done
+       @echo --------------------------------------
 
-checkboard:
+showtarget:
        @echo
-       @echo ---------- Selected Board ----------
-       @echo Selected board model is $(BOARD).
-       @echo ------------------------------------
+       @echo --------- Target Information ---------
+       @echo AVR Model: $(MCU)
+       @echo Board:     $(BOARD)
+       @echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master
+       @echo --------------------------------------
        
 # Display compiler version information.
 gccversion : 
@@ -548,26 +550,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep
        $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
 
-flip: $(TARGET).hex
-       batchisp -hardware usb -device $(MCU) -operation erase f
-       batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program
-       batchisp -hardware usb -device $(MCU) -operation start reset 0
-
-dfu: $(TARGET).hex
-       dfu-programmer $(MCU) erase
-       dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex
-       dfu-programmer $(MCU) reset
-
-flip-ee: $(TARGET).hex $(TARGET).eep
-       copy $(TARGET).eep $(TARGET)eep.hex
-       batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase
-       batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program
-       batchisp -hardware usb -device $(MCU) -operation start reset 0
-
-dfu-ee: $(TARGET).hex $(TARGET).eep
-       dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep
-       dfu-programmer $(MCU) reset
-
 
 # Generate avr-gdb config/init file which does the following:
 #     define the reset signal, load the target file, connect to target, and set 
@@ -742,8 +724,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 
 
 # Listing of phony targets.
-.PHONY : all checkhooks checklibmode checkboard   \
-begin finish end sizebefore sizeafter gccversion  \
-build elf hex eep lss sym coff extcoff clean      \
-clean_list clean_binary program debug gdb-config  \
-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \
+begin finish end sizebefore sizeafter gccversion build \
+elf hex eep lss sym coff extcoff program clean debug   \
+clean_list clean_binary gdb-config doxygen dfu flip    \
+flip-ee dfu-ee
\ No newline at end of file