Fixed low level RNDIS demo incorrectly setting the RNDIS state when a null packet...

[pub/lufa.git] / LUFA / Build / lufa_atprogram.mk

diff --git a/LUFA/Build/lufa_atprogram.mk b/LUFA/Build/lufa_atprogram.mk
index f9f5dfc..d55b02b 100644 (file)
--- a/LUFA/Build/lufa_atprogram.mk
+++ b/LUFA/Build/lufa_atprogram.mk
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2015.
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
@@ -10,8 +10,8 @@ LUFA_BUILD_MODULES         += ATPROGRAM
 LUFA_BUILD_TARGETS         += atprogram atprogram-ee
 LUFA_BUILD_MANDATORY_VARS  += MCU TARGET
 LUFA_BUILD_OPTIONAL_VARS   += ATPROGRAM_PROGRAMMER ATPROGRAM_INTERFACE ATPROGRAM_PORT
-LUFA_BUILD_PROVIDED_VARS   += 
-LUFA_BUILD_PROVIDED_MACROS += 
+LUFA_BUILD_PROVIDED_VARS   +=
+LUFA_BUILD_PROVIDED_MACROS +=
 
 # -----------------------------------------------------------------------------
 #             LUFA ATPROGRAM Programmer Buildsystem Makefile Module.
@@ -55,9 +55,9 @@ ERROR_IF_EMPTY   ?= $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $
 ERROR_IF_NONBOOL ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N))
 
 # Default values of optionally user-supplied variables
-ATPROGRAM_PROGRAMMER ?= jtagice3
+ATPROGRAM_PROGRAMMER ?= atmelice
 ATPROGRAM_INTERFACE  ?= jtag
-ATPROGRAM_PORT       ?= 
+ATPROGRAM_PORT       ?=
 
 # Sanity check user supplied values
 $(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
@@ -89,13 +89,15 @@ else
    $(error Unsupported architecture "$(ARCH)")
 endif
 
+# Programs in the target FLASH memory using ATPROGRAM
 atprogram: $(TARGET).elf $(MAKEFILE_LIST)
        @echo $(MSG_ATPROGRAM_CMD) Programming device \"$(MCU)\" FLASH using \"$(ATPROGRAM_PROGRAMMER)\"
        atprogram $(BASE_ATPROGRAM_FLAGS) program $(ATPROGRAM_FLASH_FLAGS) --file $<
 
+# Programs in the target EEPROM memory using ATPROGRAM
 atprogram-ee: $(TARGET).elf $(MAKEFILE_LIST)
        @echo $(MSG_ATPROGRAM_CMD) Programming device \"$(MCU)\" EEPROM using \"$(ATPROGRAM_PROGRAMMER)\"
        atprogram $(BASE_ATPROGRAM_FLAGS) program $(ATPROGRAM_EEPROM_FLAGS) --file $<
-       
+
 # Phony build targets for this module
 .PHONY: atprogram atprogram-ee