From 19ecd04f37f68c0674f1194aa8d8a4fc94d6168b Mon Sep 17 00:00:00 2001 From: Dean Camera <dean@fourwalledcubicle.com> Date: Tue, 13 Apr 2010 12:10:04 +0000 Subject: [PATCH] Removed invalid dfu and flip related targets from the bootloaders - bootloaders can only be replaced with an external programmer. --- Bootloaders/CDC/makefile | 37 ++-------------------------- Bootloaders/DFU/makefile | 37 ++-------------------------- Bootloaders/Incomplete/MIDI/makefile | 37 ++-------------------------- Bootloaders/TeensyHID/makefile | 37 ++-------------------------- LUFA/ManPages/ChangeLog.txt | 1 + 5 files changed, 9 insertions(+), 140 deletions(-) diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 8a5134284..f16345945 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -32,18 +32,6 @@ # make program = Download the hex file to the device, using avrdude. # Please customize the avrdude settings below first! # -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# # make doxygen = Generate DoxyGen documentation for the project (must have # DoxyGen installed) # @@ -544,27 +532,6 @@ gccversion : program: $(TARGET).hex $(TARGET).eep $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) -flip: $(TARGET).hex - batchisp -hardware usb -device $(MCU) -operation erase f - batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program - batchisp -hardware usb -device $(MCU) -operation start reset 0 - -dfu: $(TARGET).hex - dfu-programmer $(MCU) erase - dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex - dfu-programmer $(MCU) reset - -flip-ee: $(TARGET).hex $(TARGET).eep - $(COPY) $(TARGET).eep $(TARGET)eep.hex - batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase - batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program - batchisp -hardware usb -device $(MCU) -operation start reset 0 - $(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) reset - # Generate avr-gdb config/init file which does the following: # define the reset signal, load the target file, connect to target, and set @@ -742,5 +709,5 @@ $(shell mkdir $(OBJDIR) 2>/dev/null) .PHONY : all checkinvalidevents showliboptions \ showtarget begin finish end sizebefore sizeafter \ gccversion build elf hex eep lss sym coff extcoff \ -program dfu flip flip-ee dfu-ee clean debug \ -clean_list clean_binary gdb-config doxygen \ No newline at end of file +program clean debug clean_list clean_binary \ +gdb-config doxygen \ No newline at end of file diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 2cccd1d8d..b7fac1b3c 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -32,18 +32,6 @@ # make program = Download the hex file to the device, using avrdude. # Please customize the avrdude settings below first! # -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# # make doxygen = Generate DoxyGen documentation for the project (must have # DoxyGen installed) # @@ -546,27 +534,6 @@ gccversion : program: $(TARGET).hex $(TARGET).eep $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) -flip: $(TARGET).hex - batchisp -hardware usb -device $(MCU) -operation erase f - batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program - batchisp -hardware usb -device $(MCU) -operation start reset 0 - -dfu: $(TARGET).hex - dfu-programmer $(MCU) erase - dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex - dfu-programmer $(MCU) reset - -flip-ee: $(TARGET).hex $(TARGET).eep - $(COPY) $(TARGET).eep $(TARGET)eep.hex - batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase - batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program - batchisp -hardware usb -device $(MCU) -operation start reset 0 - $(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) reset - # Generate avr-gdb config/init file which does the following: # define the reset signal, load the target file, connect to target, and set @@ -744,5 +711,5 @@ $(shell mkdir $(OBJDIR) 2>/dev/null) .PHONY : all checkinvalidevents showliboptions \ showtarget begin finish end sizebefore sizeafter \ gccversion build elf hex eep lss sym coff extcoff \ -program dfu flip flip-ee dfu-ee clean debug \ -clean_list clean_binary gdb-config doxygen \ No newline at end of file +program clean debug clean_list clean_binary \ +gdb-config doxygen \ No newline at end of file diff --git a/Bootloaders/Incomplete/MIDI/makefile b/Bootloaders/Incomplete/MIDI/makefile index 4a29d0b88..faaa47b29 100644 --- a/Bootloaders/Incomplete/MIDI/makefile +++ b/Bootloaders/Incomplete/MIDI/makefile @@ -32,18 +32,6 @@ # make program = Download the hex file to the device, using avrdude. # Please customize the avrdude settings below first! # -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# # make doxygen = Generate DoxyGen documentation for the project (must have # DoxyGen installed) # @@ -535,27 +523,6 @@ gccversion : program: $(TARGET).hex $(TARGET).eep $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) -flip: $(TARGET).hex - batchisp -hardware usb -device $(MCU) -operation erase f - batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program - batchisp -hardware usb -device $(MCU) -operation start reset 0 - -dfu: $(TARGET).hex - dfu-programmer $(MCU) erase - dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex - dfu-programmer $(MCU) reset - -flip-ee: $(TARGET).hex $(TARGET).eep - $(COPY) $(TARGET).eep $(TARGET)eep.hex - batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase - batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program - batchisp -hardware usb -device $(MCU) -operation start reset 0 - $(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) reset - # Generate avr-gdb config/init file which does the following: # define the reset signal, load the target file, connect to target, and set @@ -733,5 +700,5 @@ $(shell mkdir $(OBJDIR) 2>/dev/null) .PHONY : all checkinvalidevents showliboptions \ showtarget begin finish end sizebefore sizeafter \ gccversion build elf hex eep lss sym coff extcoff \ -program dfu flip flip-ee dfu-ee clean debug \ -clean_list clean_binary gdb-config doxygen \ No newline at end of file +program clean debug clean_list clean_binary \ +gdb-config doxygen \ No newline at end of file diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile index 12b16424b..0895222a4 100644 --- a/Bootloaders/TeensyHID/makefile +++ b/Bootloaders/TeensyHID/makefile @@ -32,18 +32,6 @@ # make program = Download the hex file to the device, using avrdude. # Please customize the avrdude settings below first! # -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# # make doxygen = Generate DoxyGen documentation for the project (must have # DoxyGen installed) # @@ -544,27 +532,6 @@ gccversion : program: $(TARGET).hex $(TARGET).eep $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) -flip: $(TARGET).hex - batchisp -hardware usb -device $(MCU) -operation erase f - batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program - batchisp -hardware usb -device $(MCU) -operation start reset 0 - -dfu: $(TARGET).hex - dfu-programmer $(MCU) erase - dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex - dfu-programmer $(MCU) reset - -flip-ee: $(TARGET).hex $(TARGET).eep - $(COPY) $(TARGET).eep $(TARGET)eep.hex - batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase - batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program - batchisp -hardware usb -device $(MCU) -operation start reset 0 - $(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) reset - # Generate avr-gdb config/init file which does the following: # define the reset signal, load the target file, connect to target, and set @@ -742,5 +709,5 @@ $(shell mkdir $(OBJDIR) 2>/dev/null) .PHONY : all checkinvalidevents showliboptions \ showtarget begin finish end sizebefore sizeafter \ gccversion build elf hex eep lss sym coff extcoff \ -program dfu flip flip-ee dfu-ee clean debug \ -clean_list clean_binary gdb-config doxygen \ No newline at end of file +program clean debug clean_list clean_binary \ +gdb-config doxygen \ No newline at end of file diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index 724ef1ec4..1410cfada 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -39,6 +39,7 @@ * - Fixed incorrect definition of HID_ALIGN_DATA() causing incorrect HID report item data alignment * - Fixed Still Image Host class driver not resetting the transaction ID when a new session is opened, fixed driver not sending * a valid session ID to the device + * - Removed invalid dfu and flip related targets from the bootloaders - bootloaders can only be replaced with an external programmer * * \section Sec_ChangeLog100219 Version 100219 * -- GitLab