diff options
| -rw-r--r-- | boards.txt | 8 | ||||
| -rw-r--r-- | bootloaders/caterina/Caterina-Leonardo.hex (renamed from bootloaders/diskloader/DiskLoader-Leonardo.hex) | 0 | ||||
| -rw-r--r-- | bootloaders/caterina/Makefile (renamed from bootloaders/diskloader/Makefile) | 12 | ||||
| -rw-r--r-- | bootloaders/caterina/src/Caterina.cpp (renamed from bootloaders/diskloader/src/DiskLoader.cpp) | 0 | ||||
| -rw-r--r-- | bootloaders/caterina/src/Platform.h (renamed from bootloaders/diskloader/src/Platform.h) | 0 | ||||
| -rw-r--r-- | bootloaders/caterina/src/USBCore.cpp (renamed from bootloaders/diskloader/src/USBCore.cpp) | 0 | ||||
| -rw-r--r-- | bootloaders/caterina/src/USBCore.h (renamed from bootloaders/diskloader/src/USBCore.h) | 0 | ||||
| -rw-r--r-- | bootloaders/caterina/src/USBDesc.cpp (renamed from bootloaders/diskloader/src/USBDesc.cpp) | 0 | ||||
| -rw-r--r-- | bootloaders/caterina/src/USBDesc.h (renamed from bootloaders/diskloader/src/USBDesc.h) | 0 |
9 files changed, 10 insertions, 10 deletions
@@ -153,8 +153,8 @@ leonardo.upload.speed=1200 leonardo.bootloader.low_fuses=0xde leonardo.bootloader.high_fuses=0xda leonardo.bootloader.extended_fuses=0xcb -leonardo.bootloader.path=diskloader -leonardo.bootloader.file=DiskLoader-Leonardo.hex +leonardo.bootloader.path=caterina +leonardo.bootloader.file=Caterina-Leonardo.hex leonardo.bootloader.unlock_bits=0x3F leonardo.bootloader.lock_bits=0x2F leonardo.build.mcu=atmega32u4 @@ -171,8 +171,8 @@ leonardo.build.variant=leonardo #micro.bootloader.low_fuses=0xde #micro.bootloader.high_fuses=0xda #micro.bootloader.extended_fuses=0xcb -#micro.bootloader.path=diskloader -#micro.bootloader.file=DiskLoader-Micro.hex +#micro.bootloader.path=caterina +#micro.bootloader.file=Caterina-Micro.hex #micro.bootloader.unlock_bits=0x3F #micro.bootloader.lock_bits=0x2F #micro.build.mcu=atmega32u4 diff --git a/bootloaders/diskloader/DiskLoader-Leonardo.hex b/bootloaders/caterina/Caterina-Leonardo.hex index 95ca57b..95ca57b 100644 --- a/bootloaders/diskloader/DiskLoader-Leonardo.hex +++ b/bootloaders/caterina/Caterina-Leonardo.hex diff --git a/bootloaders/diskloader/Makefile b/bootloaders/caterina/Makefile index ed4ba78..4bb41c8 100644 --- a/bootloaders/diskloader/Makefile +++ b/bootloaders/caterina/Makefile @@ -1,10 +1,10 @@ ############################################################################### -# Makefile for DiskLoader +# Makefile for Caterina (formerly DiskLoader) ############################################################################### ## General Flags -PROJECT = DiskLoader -TARGET = DiskLoader.elf +PROJECT = Caterina +TARGET = Caterina.elf CC = avr-gcc # BOARD2 @@ -24,7 +24,7 @@ AVRDUDE_PROGRAMMER = avrispmkII AVRDUDE_PORT = usb # program name should not be changed... -PROGRAM = DiskLoader +PROGRAM = Caterina AVRDUDE = avrdude AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -p $(MCU) @@ -41,7 +41,7 @@ ASMFLAGS += -x assembler-with-cpp -Wa,-gdwarf2 ## Linker flags LDFLAGS = $(COMMON) -LDFLAGS += -Wl,-gc-sections,-Map=DiskLoader.map,--section-start=.text=0x7800,--relax +LDFLAGS += -Wl,-gc-sections,-Map=Caterina.map,--section-start=.text=0x7800,--relax LDFLAGS += -nodefaultlibs -nostartfiles ## Intel Hex file production flags @@ -65,7 +65,7 @@ vpath %.cpp $(SRC_DIR) .PHONY: all checkdirs clean -all: checkdirs $(TARGET) DiskLoader.hex DiskLoader.lss size +all: checkdirs $(TARGET) Caterina.hex Caterina.lss size -include $(DEP) diff --git a/bootloaders/diskloader/src/DiskLoader.cpp b/bootloaders/caterina/src/Caterina.cpp index 7ef6fa8..7ef6fa8 100644 --- a/bootloaders/diskloader/src/DiskLoader.cpp +++ b/bootloaders/caterina/src/Caterina.cpp diff --git a/bootloaders/diskloader/src/Platform.h b/bootloaders/caterina/src/Platform.h index 9d18e80..9d18e80 100644 --- a/bootloaders/diskloader/src/Platform.h +++ b/bootloaders/caterina/src/Platform.h diff --git a/bootloaders/diskloader/src/USBCore.cpp b/bootloaders/caterina/src/USBCore.cpp index ac5d081..ac5d081 100644 --- a/bootloaders/diskloader/src/USBCore.cpp +++ b/bootloaders/caterina/src/USBCore.cpp diff --git a/bootloaders/diskloader/src/USBCore.h b/bootloaders/caterina/src/USBCore.h index 313ae3b..313ae3b 100644 --- a/bootloaders/diskloader/src/USBCore.h +++ b/bootloaders/caterina/src/USBCore.h diff --git a/bootloaders/diskloader/src/USBDesc.cpp b/bootloaders/caterina/src/USBDesc.cpp index a634d4d..a634d4d 100644 --- a/bootloaders/diskloader/src/USBDesc.cpp +++ b/bootloaders/caterina/src/USBDesc.cpp diff --git a/bootloaders/diskloader/src/USBDesc.h b/bootloaders/caterina/src/USBDesc.h index fa962e9..fa962e9 100644 --- a/bootloaders/diskloader/src/USBDesc.h +++ b/bootloaders/caterina/src/USBDesc.h |