diff options
author | Dean Camera <[email protected]> | 2010-09-24 06:45:11 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2010-09-24 06:45:11 +0000 |
commit | bd85422d2beb8b14e617839b7d05e7306df83edc (patch) | |
tree | 0f3d77d6edb3549fafa5a6e89aea371be0697251 /Projects | |
parent | b48095c0fbd9774413702b0226ef72926034e6c6 (diff) | |
download | qmk_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 'Projects')
-rw-r--r-- | Projects/AVRISP-MKII/makefile | 6 | ||||
-rw-r--r-- | Projects/Benito/makefile | 6 | ||||
-rw-r--r-- | Projects/Incomplete/StandaloneProgrammer/makefile | 6 | ||||
-rw-r--r-- | Projects/LEDNotifier/makefile | 6 | ||||
-rw-r--r-- | Projects/Magstripe/makefile | 6 | ||||
-rw-r--r-- | Projects/MissileLauncher/makefile | 6 | ||||
-rw-r--r-- | Projects/RelayBoard/makefile | 6 | ||||
-rw-r--r-- | Projects/TempDataLogger/makefile | 6 | ||||
-rw-r--r-- | Projects/USBtoSerial/makefile | 6 | ||||
-rw-r--r-- | Projects/Webserver/makefile | 6 | ||||
-rw-r--r-- | Projects/XPLAINBridge/makefile | 6 |
11 files changed, 33 insertions, 33 deletions
diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile index db119534f5..a995bddc02 100644 --- a/Projects/AVRISP-MKII/makefile +++ b/Projects/AVRISP-MKII/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. @@ -544,7 +544,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 @@ -555,7 +555,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/Projects/Benito/makefile b/Projects/Benito/makefile index 9d29f6a40a..35073f8617 100644 --- a/Projects/Benito/makefile +++ b/Projects/Benito/makefile @@ -66,7 +66,7 @@ MCU = atmega32u2 # 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 = BENITO +BOARD = BENITO # Processor frequency. @@ -530,7 +530,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 @@ -541,7 +541,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/Projects/Incomplete/StandaloneProgrammer/makefile b/Projects/Incomplete/StandaloneProgrammer/makefile index 47fed5c193..40de1948e2 100644 --- a/Projects/Incomplete/StandaloneProgrammer/makefile +++ b/Projects/Incomplete/StandaloneProgrammer/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. @@ -530,7 +530,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 @@ -541,7 +541,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/Projects/LEDNotifier/makefile b/Projects/LEDNotifier/makefile index 4b168b4bc5..39e8a11acf 100644 --- a/Projects/LEDNotifier/makefile +++ b/Projects/LEDNotifier/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 = BUI +BOARD = BUI # 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/Projects/Magstripe/makefile b/Projects/Magstripe/makefile index e168aa46a6..3773dfeeff 100644 --- a/Projects/Magstripe/makefile +++ b/Projects/Magstripe/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 = NONE +BOARD = NONE # Processor frequency. @@ -533,7 +533,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 @@ -544,7 +544,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/Projects/MissileLauncher/makefile b/Projects/MissileLauncher/makefile index 082df26687..7df04f3b3a 100644 --- a/Projects/MissileLauncher/makefile +++ b/Projects/MissileLauncher/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. @@ -518,7 +518,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 @@ -529,7 +529,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/Projects/RelayBoard/makefile b/Projects/RelayBoard/makefile index 5dc0184ace..0672354c3e 100644 --- a/Projects/RelayBoard/makefile +++ b/Projects/RelayBoard/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/Projects/TempDataLogger/makefile b/Projects/TempDataLogger/makefile index ef31c50261..4f04ce5db4 100644 --- a/Projects/TempDataLogger/makefile +++ b/Projects/TempDataLogger/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. @@ -532,7 +532,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 @@ -543,7 +543,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/Projects/USBtoSerial/makefile b/Projects/USBtoSerial/makefile index b85e7a3b95..4aaf262f6a 100644 --- a/Projects/USBtoSerial/makefile +++ b/Projects/USBtoSerial/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. @@ -522,7 +522,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 @@ -533,7 +533,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/Projects/Webserver/makefile b/Projects/Webserver/makefile index 1f9bb9ab32..28dc05ba02 100644 --- a/Projects/Webserver/makefile +++ b/Projects/Webserver/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. @@ -556,7 +556,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 @@ -567,7 +567,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/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile index 42807d1ab3..3088442298 100644 --- a/Projects/XPLAINBridge/makefile +++ b/Projects/XPLAINBridge/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 = XPLAIN +BOARD = XPLAIN # Processor frequency. @@ -547,7 +547,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 @@ -558,7 +558,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 |