aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-09-24 06:45:11 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-09-24 06:45:11 +0000
commitbd85422d2beb8b14e617839b7d05e7306df83edc (patch)
tree0f3d77d6edb3549fafa5a6e89aea371be0697251 /LUFA
parentb48095c0fbd9774413702b0226ef72926034e6c6 (diff)
downloadlufa-bd85422d2beb8b14e617839b7d05e7306df83edc.tar.gz
lufa-bd85422d2beb8b14e617839b7d05e7306df83edc.tar.bz2
lufa-bd85422d2beb8b14e617839b7d05e7306df83edc.zip
Added the --suppress-bootloader-mem option to the makefile dfu target, to ensure that writes to the bootloader section of the AVR's flash memory are ignored (thanks to Axel Rohde).
Fixed incorrect command name for EEPROM memory programming in the makefile dfu-ee target. Makefile whitespace fixes.
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/CodeTemplates/makefile_template6
-rw-r--r--LUFA/ManPages/ChangeLog.txt3
-rw-r--r--LUFA/ManPages/WritingBoardDrivers.txt10
3 files changed, 11 insertions, 8 deletions
diff --git a/LUFA/CodeTemplates/makefile_template b/LUFA/CodeTemplates/makefile_template
index a1176a428..c10bcf9ec 100644
--- a/LUFA/CodeTemplates/makefile_template
+++ b/LUFA/CodeTemplates/makefile_template
@@ -66,7 +66,7 @@ MCU = ### INSERT NAME OF MICROCONTROLLER MODEL HERE ###
# Target board (see library "Board Types" documentation, NONE for projects not requiring
# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
# "Board" inside the application directory.
-BOARD = ### INSERT NAME OF BOARD HERE, OR NONE IF NO BOARD DRIVERS USED ###
+BOARD = ### INSERT NAME OF BOARD HERE, OR NONE IF NO BOARD DRIVERS USED ###
# Processor frequency.
@@ -516,7 +516,7 @@ flip: $(TARGET).hex
dfu: $(TARGET).hex
dfu-programmer $(MCU) erase
- dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex
+ dfu-programmer $(MCU) flash --suppress-bootloader-mem --debug 1 $(TARGET).hex
dfu-programmer $(MCU) reset
flip-ee: $(TARGET).hex $(TARGET).eep
@@ -527,7 +527,7 @@ flip-ee: $(TARGET).hex $(TARGET).eep
$(REMOVE) $(TARGET)eep.hex
dfu-ee: $(TARGET).hex $(TARGET).eep
- dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep
+ dfu-programmer $(MCU) eeprom-flash --debug 1 --suppress-bootloader-mem $(TARGET).eep
dfu-programmer $(MCU) reset
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 24dd943fb..132aa4898 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -42,6 +42,8 @@
* to free up the Start of Frame flag for interrupt use in the user application
* - All project makefiles now correctly clean intermediate build files from assembly and C++ sources (thanks to Daniel Czigany)
* - Removed the EVENT_USB_InitFailure() event, not specifying a USB mode now defaults to UID selection mode
+ * - Added the --suppress-bootloader-mem option to the makefile dfu target, to ensure that writes to the bootloader section of the AVR's
+ * flash memory are ignored (thanks to Axel Rohde)
*
* <b>Fixed:</b>
* - Fixed USB_GetHIDReportItemInfo() function modifying the given report item's data when the report item does not exist
@@ -59,6 +61,7 @@
* - Fixed USB_Host_ClearPipeStall() incorrectly determining the endpoint direction from the currently selected pipe
* - Fixed JTAG_DEBUG_POINT() and JTAG_DEBUG_BREAK() macros not compiling under pure C99 standards mode
* - Fixed endpoint selection within the CALLBACK_HID_Device_CreateHIDReport() callback function causing broken GET REPORT requests
+ * - Fixed incorrect command name for EEPROM memory programming in the makefile dfu-ee target
*
* \section Sec_ChangeLog100807 Version 100807
* <b>New:</b>
diff --git a/LUFA/ManPages/WritingBoardDrivers.txt b/LUFA/ManPages/WritingBoardDrivers.txt
index c3371a93a..dd0ea47c7 100644
--- a/LUFA/ManPages/WritingBoardDrivers.txt
+++ b/LUFA/ManPages/WritingBoardDrivers.txt
@@ -18,9 +18,9 @@
* with the LUFA hardware API. To do this, the BOARD macro should be defined to the value BOARD_USER. This indicates
* that the board level drivers should be located in a folder named "Board" located inside the application's folder.
*
- * When used, the driver stub files located in the DriverStubs folder should be copied to the user Board directory,
- * and fleshed out to include the values and code needed to control the custom board hardware. Once done, the existing
- * LUFA board level APIs (accessed in the regular LUFA/Drivers/Board/ folder) will redirect to the user board drivers,
- * maintaining code compatibility and allowing for a different board to be selected through the project makefile with
- * no code changes.
+ * When used, the driver stub files located in the LUFA/CodeTemplates/DriverStubs folder should be copied to the user
+ * Board/ directory, and fleshed out to include the values and code needed to control the custom board hardware. Once
+ * done, the existing LUFA board level APIs (accessed in the regular LUFA/Drivers/Board/ folder) will redirect to the
+ * user board drivers, maintaining code compatibility and allowing for a different board to be selected through the
+ * project makefile with no code changes.
*/