diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2016-02-07 16:15:29 +1100 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2016-02-07 16:15:29 +1100 |
| commit | f7cdc8236988eca7f5b22a87c648f989414be1e8 (patch) | |
| tree | dda19d6a58c25361e11c7a263e8e570ac7de9a77 | |
| parent | f52566d6db90f29e3e92f7b13e3a8659dc136bbf (diff) | |
| download | lufa-f7cdc8236988eca7f5b22a87c648f989414be1e8.tar.gz lufa-f7cdc8236988eca7f5b22a87c648f989414be1e8.tar.bz2 lufa-f7cdc8236988eca7f5b22a87c648f989414be1e8.zip | |
Added AVRDUDE_MEMORY option to the AVRDUDE build system module (thanks to Alex Ferm).
| -rw-r--r-- | LUFA/Build/lufa_avrdude.mk | 7 | ||||
| -rw-r--r-- | LUFA/DoxygenPages/BuildSystem.txt | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/LUFA/Build/lufa_avrdude.mk b/LUFA/Build/lufa_avrdude.mk index 04ce01237..d035e0788 100644 --- a/LUFA/Build/lufa_avrdude.mk +++ b/LUFA/Build/lufa_avrdude.mk @@ -9,7 +9,7 @@ LUFA_BUILD_MODULES += AVRDUDE LUFA_BUILD_TARGETS += avrdude avrdude-ee LUFA_BUILD_MANDATORY_VARS += MCU TARGET -LUFA_BUILD_OPTIONAL_VARS += AVRDUDE_PROGRAMMER AVRDUDE_PORT AVRDUDE_FLAGS +LUFA_BUILD_OPTIONAL_VARS += AVRDUDE_PROGRAMMER AVRDUDE_PORT AVRDUDE_FLAGS AVRDUDE_MEMORY LUFA_BUILD_PROVIDED_VARS += LUFA_BUILD_PROVIDED_MACROS += @@ -37,6 +37,8 @@ LUFA_BUILD_PROVIDED_MACROS += # AVRDUDE_PROGRAMMER - Name of programming hardware to use # AVRDUDE_PORT - Name of communication port to use # AVRDUDE_FLAGS - Flags to pass to avr-dude +# AVRDUDE_MEMORY - Memory space to program application into (e.g. +# "application" for an XMEGA DFU device) # # PROVIDED VARIABLES: # @@ -58,6 +60,7 @@ ERROR_IF_NONBOOL ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(s AVRDUDE_PROGRAMMER ?= jtagicemkii AVRDUDE_PORT ?= usb AVRDUDE_FLAGS ?= +AVRDUDE_MEMORY ?= flash # Sanity check user supplied values $(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR))) @@ -75,7 +78,7 @@ BASE_AVRDUDE_FLAGS := -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) # Programs in the target FLASH memory using AVRDUDE avrdude: $(TARGET).hex $(MAKEFILE_LIST) @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" FLASH using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\" - avrdude $(BASE_AVRDUDE_FLAGS) -U flash:w:$< $(AVRDUDE_FLAGS) + avrdude $(BASE_AVRDUDE_FLAGS) -U $(AVRDUDE_MEMORY):w:$< $(AVRDUDE_FLAGS) # Programs in the target EEPROM memory using AVRDUDE avrdude-ee: $(TARGET).eep $(MAKEFILE_LIST) diff --git a/LUFA/DoxygenPages/BuildSystem.txt b/LUFA/DoxygenPages/BuildSystem.txt index 7ddfa1be3..e06727e84 100644 --- a/LUFA/DoxygenPages/BuildSystem.txt +++ b/LUFA/DoxygenPages/BuildSystem.txt @@ -443,6 +443,10 @@ * <td><tt>AVRDUDE_FLAGS</tt></td>
* <td>Additional flags to pass to avrdude when programming, applied after the automatically generated flags.</td>
* </tr>
+ * <tr>
+ * <td><tt>AVRDUDE_MEMORY</tt></td>
+ * <td>Main memory space used when programming in an application *e.g. <tt>application</tt> for a DFU bootloader, or <tt>flash</tt> for a regular programmer).</td>
+ * </tr>
* </table>
*
* \section SSec_BuildModule_AVRDUDE_ProvidedVariables Module Provided Variables
|