Simplify AVRDUDE build module, ensure that the correct target names for FLASH and...

diff --git a/LUFA/Build/lufa.avrdude.in b/LUFA/Build/lufa.avrdude.in
index 256fdff..e650ee4 100644 (file)
--- a/LUFA/Build/lufa.avrdude.in
+++ b/LUFA/Build/lufa.avrdude.in
@@ -57,17 +57,13 @@ AVRDUDE_FLAGS      ?=
 # Output Messages\r
 MSG_AVRDUDE_CMD    := ' [AVRDUDE] :'\r
 \r
 # Output Messages\r
 MSG_AVRDUDE_CMD    := ' [AVRDUDE] :'\r
 \r

-# Construct flags to use for the different memory spaces\r
-AVRDUDE_FLASH_FLAGS = -U flash:w:$< $(AVRDUDE_FLAGS)\r
-AVRDUDE_EEP_FLAGS   = -U eeprom:w:$< $(AVRDUDE_FLAGS)\r
-\r

 avrdude: $(TARGET).hex $(MAKEFILE_LIST)\r
        @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" FLASH with settings \"$(AVRDUDE_FLASH_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"\r
 avrdude: $(TARGET).hex $(MAKEFILE_LIST)\r
        @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" FLASH with settings \"$(AVRDUDE_FLASH_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"\r

-       avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) $(AVRDUDE_FLASH_FLAGS)\r
+       avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -U flash:w:$< $(AVRDUDE_FLAGS)\r

 \r
 avrdude-ee: $(TARGET).eep $(MAKEFILE_LIST)\r
        @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" EEPROM with settings \"$(AVRDUDE_EEP_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"\r
 \r
 avrdude-ee: $(TARGET).eep $(MAKEFILE_LIST)\r
        @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" EEPROM with settings \"$(AVRDUDE_EEP_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"\r

-       avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) $(AVRDUDE_EEP_FLAGS)\r
+       avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -U eeprom:w:$< $(AVRDUDE_FLAGS)\r

 \r
 # Phony build targets for this module\r
 .PHONY: avrdude avrdude-ee\r
 \r
 # Phony build targets for this module\r
 .PHONY: avrdude avrdude-ee\r