aboutsummaryrefslogtreecommitdiff
path: root/Demos/Device/ClassDriver
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2010-09-24 06:45:11 +0000
committerDean Camera <[email protected]>2010-09-24 06:45:11 +0000
commitbd85422d2beb8b14e617839b7d05e7306df83edc (patch)
tree0f3d77d6edb3549fafa5a6e89aea371be0697251 /Demos/Device/ClassDriver
parentb48095c0fbd9774413702b0226ef72926034e6c6 (diff)
downloadqmk_firmware-bd85422d2beb8b14e617839b7d05e7306df83edc.tar.gz
qmk_firmware-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 'Demos/Device/ClassDriver')
-rw-r--r--Demos/Device/ClassDriver/AudioInput/makefile6
-rw-r--r--Demos/Device/ClassDriver/AudioOutput/makefile6
-rw-r--r--Demos/Device/ClassDriver/DualVirtualSerial/makefile6
-rw-r--r--Demos/Device/ClassDriver/GenericHID/makefile6
-rw-r--r--Demos/Device/ClassDriver/Joystick/makefile6
-rw-r--r--Demos/Device/ClassDriver/Keyboard/makefile6
-rw-r--r--Demos/Device/ClassDriver/KeyboardMouse/makefile6
-rw-r--r--Demos/Device/ClassDriver/MIDI/makefile6
-rw-r--r--Demos/Device/ClassDriver/MassStorage/makefile6
-rw-r--r--Demos/Device/ClassDriver/MassStorageKeyboard/makefile6
-rw-r--r--Demos/Device/ClassDriver/Mouse/makefile6
-rw-r--r--Demos/Device/ClassDriver/RNDISEthernet/makefile6
-rw-r--r--Demos/Device/ClassDriver/VirtualSerial/makefile6
-rw-r--r--Demos/Device/ClassDriver/VirtualSerialMouse/makefile6
14 files changed, 42 insertions, 42 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile
index 86f34e6cec..470f83211e 100644
--- a/Demos/Device/ClassDriver/AudioInput/makefile
+++ b/Demos/Device/ClassDriver/AudioInput/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -523,7 +523,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
@@ -534,7 +534,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/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile
index e1b0dd81cf..8f2978b8a9 100644
--- a/Demos/Device/ClassDriver/AudioOutput/makefile
+++ b/Demos/Device/ClassDriver/AudioOutput/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -525,7 +525,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
@@ -536,7 +536,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/Demos/Device/ClassDriver/DualVirtualSerial/makefile b/Demos/Device/ClassDriver/DualVirtualSerial/makefile
index da7c7ca2fa..e270575e20 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/makefile
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile
index 8109121632..b2a80ea86e 100644
--- a/Demos/Device/ClassDriver/GenericHID/makefile
+++ b/Demos/Device/ClassDriver/GenericHID/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile
index 40ace20d1c..37431cd8eb 100644
--- a/Demos/Device/ClassDriver/Joystick/makefile
+++ b/Demos/Device/ClassDriver/Joystick/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile
index b392752c80..9fe72e23ec 100644
--- a/Demos/Device/ClassDriver/Keyboard/makefile
+++ b/Demos/Device/ClassDriver/Keyboard/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile
index b7dbd1f639..115759ed85 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/makefile
+++ b/Demos/Device/ClassDriver/KeyboardMouse/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile
index 038f0446a9..e6aec7eb61 100644
--- a/Demos/Device/ClassDriver/MIDI/makefile
+++ b/Demos/Device/ClassDriver/MIDI/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index 390adaecbb..6ec34ec73c 100644
--- a/Demos/Device/ClassDriver/MassStorage/makefile
+++ b/Demos/Device/ClassDriver/MassStorage/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -524,7 +524,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
@@ -535,7 +535,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/Demos/Device/ClassDriver/MassStorageKeyboard/makefile b/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
index 154c3e1eec..bc1b9ce14e 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -524,7 +524,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
@@ -535,7 +535,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/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile
index c7cb09a330..306f2e6832 100644
--- a/Demos/Device/ClassDriver/Mouse/makefile
+++ b/Demos/Device/ClassDriver/Mouse/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile
index 59226883d5..758a77f829 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/makefile
+++ b/Demos/Device/ClassDriver/RNDISEthernet/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -540,7 +540,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
@@ -551,7 +551,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/Demos/Device/ClassDriver/VirtualSerial/makefile b/Demos/Device/ClassDriver/VirtualSerial/makefile
index 52a8cce587..d40208c39a 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/makefile
+++ b/Demos/Device/ClassDriver/VirtualSerial/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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/Demos/Device/ClassDriver/VirtualSerialMouse/makefile b/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
index 240628d344..7e2bd6d49c 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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 = USBKEY
+BOARD = USBKEY
# Processor frequency.
@@ -521,7 +521,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
@@ -532,7 +532,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