aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-06-06 19:22:20 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-06-06 19:22:20 +0000
commit3f82cb8dc37d8e094e03b68fba285e796b7a289a (patch)
tree6add8c5cb3cae8c2355e168eb6305dd4bc2bf749
parent94a1b4da06c234c103598271c02ee4caff3d8cb2 (diff)
downloadlufa-3f82cb8dc37d8e094e03b68fba285e796b7a289a.tar.gz
lufa-3f82cb8dc37d8e094e03b68fba285e796b7a289a.tar.bz2
lufa-3f82cb8dc37d8e094e03b68fba285e796b7a289a.zip
Simplify AVRDUDE build module, ensure that the correct target names for FLASH and EEPROM writing are passed to the programmer tool.
-rw-r--r--LUFA/Build/lufa.avrdude.in8
1 files changed, 2 insertions, 6 deletions
diff --git a/LUFA/Build/lufa.avrdude.in b/LUFA/Build/lufa.avrdude.in
index 256fdff28..e650ee4ae 100644
--- a/LUFA/Build/lufa.avrdude.in
+++ b/LUFA/Build/lufa.avrdude.in
@@ -57,17 +57,13 @@ AVRDUDE_FLAGS ?=
# Output Messages
MSG_AVRDUDE_CMD := ' [AVRDUDE] :'
-# Construct flags to use for the different memory spaces
-AVRDUDE_FLASH_FLAGS = -U flash:w:$< $(AVRDUDE_FLAGS)
-AVRDUDE_EEP_FLAGS = -U eeprom:w:$< $(AVRDUDE_FLAGS)
-
avrdude: $(TARGET).hex $(MAKEFILE_LIST)
@echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" FLASH with settings \"$(AVRDUDE_FLASH_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"
- avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) $(AVRDUDE_FLASH_FLAGS)
+ avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -U flash:w:$< $(AVRDUDE_FLAGS)
avrdude-ee: $(TARGET).eep $(MAKEFILE_LIST)
@echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" EEPROM with settings \"$(AVRDUDE_EEP_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"
- avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) $(AVRDUDE_EEP_FLAGS)
+ avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -U eeprom:w:$< $(AVRDUDE_FLAGS)
# Phony build targets for this module
.PHONY: avrdude avrdude-ee