eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify CDC and DFU bootloaders so that the various BootloaderAPI components are in unique sections and mapped explicitly - this will ensure the API and signature entries are always linked at the correct explicit address.

This commit is contained in:
Dean Camera 2012-06-15 16:02:19 +00:00
parent c4ebddd27a
commit 4da2ba9f1c
4 changed files with 93 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Bootloaders/CDC/BootloaderAPITable.S
View File

@ -28,41 +28,44 @@
this software. this software.
*/ */
; Bootloader API Jump Table
.section .apitable, "ax"
; Trampolines to actual API implementations if the target address is outside the ; Trampolines to actual API implementations if the target address is outside the
; range of a rjmp instruction (can happen with large bootloader sections) ; range of a rjmp instruction (can happen with large bootloader sections)
.org 0 .section .apitable_trampolines, "ax"
BootloaderAPI_ErasePage_Trampoline: .global BootloaderAPI_Trampolines
jmp BootloaderAPI_ErasePage BootloaderAPI_Trampolines:
BootloaderAPI_WritePage_Trampoline:
jmp BootloaderAPI_WritePage BootloaderAPI_ErasePage_Trampoline:
BootloaderAPI_FillWord_Trampoline: jmp BootloaderAPI_ErasePage
jmp BootloaderAPI_FillWord BootloaderAPI_WritePage_Trampoline:
BootloaderAPI_ReadSignature_Trampoline: jmp BootloaderAPI_WritePage
jmp BootloaderAPI_ReadSignature BootloaderAPI_FillWord_Trampoline:
BootloaderAPI_ReadFuse_Trampoline: jmp BootloaderAPI_FillWord
jmp BootloaderAPI_ReadFuse BootloaderAPI_ReadSignature_Trampoline:
BootloaderAPI_ReadLock_Trampoline: jmp BootloaderAPI_ReadSignature
jmp BootloaderAPI_ReadLock BootloaderAPI_ReadFuse_Trampoline:
BootloaderAPI_WriteLock_Trampoline: jmp BootloaderAPI_ReadFuse
jmp BootloaderAPI_WriteLock BootloaderAPI_ReadLock_Trampoline:
BootloaderAPU_UNUSED1: jmp BootloaderAPI_ReadLock
ret BootloaderAPI_WriteLock_Trampoline:
BootloaderAPU_UNUSED2: jmp BootloaderAPI_WriteLock
ret BootloaderAPU_UNUSED1:
BootloaderAPU_UNUSED3: ret
ret BootloaderAPU_UNUSED2:
BootloaderAPU_UNUSED4: ret
ret BootloaderAPU_UNUSED3:
BootloaderAPU_UNUSED5: ret
ret BootloaderAPU_UNUSED4:
ret
BootloaderAPU_UNUSED5:
ret
; API function jump table ; API function jump table
.org (96 - 32) .section .apitable_jumptable, "ax"
.global BootloaderAPI_JumpTable .global BootloaderAPI_JumpTable
BootloaderAPI_JumpTable: BootloaderAPI_JumpTable:
rjmp BootloaderAPI_ErasePage_Trampoline rjmp BootloaderAPI_ErasePage_Trampoline
rjmp BootloaderAPI_WritePage_Trampoline rjmp BootloaderAPI_WritePage_Trampoline
rjmp BootloaderAPI_FillWord_Trampoline rjmp BootloaderAPI_FillWord_Trampoline
@ -76,10 +79,13 @@ BootloaderAPI_JumpTable:
rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4 rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4
rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5 rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5
; Bootloader table signatures and information ; Bootloader table signatures and information
.org (96 - 8) .section .apitable_signatures, "ax"
BootloaderAPI_Signatures:
.global BootloaderAPI_Signatures .global BootloaderAPI_Signatures
BootloaderAPI_Signatures:
.long BOOT_START_ADDR ; Start address of the bootloader .long BOOT_START_ADDR ; Start address of the bootloader
.word 0xCDC1 ; Signature for the CDC class bootloader, V1 .word 0xDFB1 ; Signature for the DFU class bootloader, V1
.word 0xDCFB ; Signature for a LUFA class bootloader .word 0xDCFB ; Signature for a LUFA class bootloader

13
Bootloaders/CDC/makefile
View File

@ -15,10 +15,15 @@
FLASH_SIZE_KB := 128 FLASH_SIZE_KB := 128
BOOT_SECTION_SIZE_KB := 8 BOOT_SECTION_SIZE_KB := 8
# Bootloader address calculations (requires the "bc" unix utility) - do # Bootloader address calculations (requires the "bc" unix utility) and
# not modify these calculations, but rather modify the depedant values above. # API section start directives - do not modify these macros, but rather
# modify the depedant values above.
BOOT_START := 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc) BOOT_START := 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc)
BOOT_API_TABLESTART := 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - 96)" | bc) BOOT_SEC_OFFSET = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - $(strip $(1)))" | bc)
BOOT_SECTION_LD_FLAG = -Wl,--section-start=.apitable_$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=BootloaderAPI_$(strip $(2))
BOOT_API_LD_FLAGS := $(call BOOT_SECTION_LD_FLAG, trampolines, Trampolines, (48 + 32 + 8))
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, jumptable, JumpTable, (32 + 8))
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, signatures, Signatures, 8)
MCU = at90usb1287 MCU = at90usb1287
ARCH = AVR8 ARCH = AVR8
@ -30,7 +35,7 @@ TARGET = BootloaderCDC
SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB) SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB)
LUFA_PATH = ../../LUFA/ LUFA_PATH = ../../LUFA/
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START) CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START)
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START) -Wl,--section-start=.apitable=$(BOOT_API_TABLESTART) -Wl,--undefined=BootloaderAPI_JumpTable LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START) $(BOOT_API_LD_FLAGS)
# Default target # Default target
all: all:

68
Bootloaders/DFU/BootloaderAPITable.S
View File

@ -28,41 +28,44 @@
this software. this software.
*/ */
; Bootloader API Jump Table
.section .apitable, "ax"
; Trampolines to actual API implementations if the target address is outside the ; Trampolines to actual API implementations if the target address is outside the
; range of a rjmp instruction (can happen with large bootloader sections) ; range of a rjmp instruction (can happen with large bootloader sections)
.org 0 .section .apitable_trampolines, "ax"
BootloaderAPI_ErasePage_Trampoline: .global BootloaderAPI_Trampolines
jmp BootloaderAPI_ErasePage BootloaderAPI_Trampolines:
BootloaderAPI_WritePage_Trampoline:
jmp BootloaderAPI_WritePage BootloaderAPI_ErasePage_Trampoline:
BootloaderAPI_FillWord_Trampoline: jmp BootloaderAPI_ErasePage
jmp BootloaderAPI_FillWord BootloaderAPI_WritePage_Trampoline:
BootloaderAPI_ReadSignature_Trampoline: jmp BootloaderAPI_WritePage
jmp BootloaderAPI_ReadSignature BootloaderAPI_FillWord_Trampoline:
BootloaderAPI_ReadFuse_Trampoline: jmp BootloaderAPI_FillWord
jmp BootloaderAPI_ReadFuse BootloaderAPI_ReadSignature_Trampoline:
BootloaderAPI_ReadLock_Trampoline: jmp BootloaderAPI_ReadSignature
jmp BootloaderAPI_ReadLock BootloaderAPI_ReadFuse_Trampoline:
BootloaderAPI_WriteLock_Trampoline: jmp BootloaderAPI_ReadFuse
jmp BootloaderAPI_WriteLock BootloaderAPI_ReadLock_Trampoline:
BootloaderAPU_UNUSED1: jmp BootloaderAPI_ReadLock
ret BootloaderAPI_WriteLock_Trampoline:
BootloaderAPU_UNUSED2: jmp BootloaderAPI_WriteLock
ret BootloaderAPU_UNUSED1:
BootloaderAPU_UNUSED3: ret
ret BootloaderAPU_UNUSED2:
BootloaderAPU_UNUSED4: ret
ret BootloaderAPU_UNUSED3:
BootloaderAPU_UNUSED5: ret
ret BootloaderAPU_UNUSED4:
ret
BootloaderAPU_UNUSED5:
ret
; API function jump table ; API function jump table
.org (96 - 32) .section .apitable_jumptable, "ax"
.global BootloaderAPI_JumpTable .global BootloaderAPI_JumpTable
BootloaderAPI_JumpTable: BootloaderAPI_JumpTable:
rjmp BootloaderAPI_ErasePage_Trampoline rjmp BootloaderAPI_ErasePage_Trampoline
rjmp BootloaderAPI_WritePage_Trampoline rjmp BootloaderAPI_WritePage_Trampoline
rjmp BootloaderAPI_FillWord_Trampoline rjmp BootloaderAPI_FillWord_Trampoline
@ -76,10 +79,13 @@ BootloaderAPI_JumpTable:
rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4 rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4
rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5 rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5
; Bootloader table signatures and information ; Bootloader table signatures and information
.org (96 - 8) .section .apitable_signatures, "ax"
BootloaderAPI_Signatures:
.global BootloaderAPI_Signatures .global BootloaderAPI_Signatures
BootloaderAPI_Signatures:
.long BOOT_START_ADDR ; Start address of the bootloader .long BOOT_START_ADDR ; Start address of the bootloader
.word 0xDFB1 ; Signature for the DFU class bootloader, V1 .word 0xDFB1 ; Signature for the DFU class bootloader, V1
.word 0xDCFB ; Signature for a LUFA class bootloader .word 0xDCFB ; Signature for a LUFA class bootloader

13
Bootloaders/DFU/makefile
View File

@ -15,10 +15,15 @@
FLASH_SIZE_KB := 128 FLASH_SIZE_KB := 128
BOOT_SECTION_SIZE_KB := 8 BOOT_SECTION_SIZE_KB := 8
# Bootloader address calculations (requires the "bc" unix utility) - do # Bootloader address calculations (requires the "bc" unix utility) and
# not modify these calculations, but rather modify the depedant values above. # API section start directives - do not modify these macros, but rather
# modify the depedant values above.
BOOT_START := 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc) BOOT_START := 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc)
BOOT_API_TABLESTART := 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - 96)" | bc) BOOT_SEC_OFFSET = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - $(strip $(1)))" | bc)
BOOT_SECTION_LD_FLAG = -Wl,--section-start=.apitable_$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=BootloaderAPI_$(strip $(2))
BOOT_API_LD_FLAGS := $(call BOOT_SECTION_LD_FLAG, trampolines, Trampolines, (48 + 32 + 8))
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, jumptable, JumpTable, (32 + 8))
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, signatures, Signatures, 8)
MCU = at90usb1287 MCU = at90usb1287
ARCH = AVR8 ARCH = AVR8
@ -30,7 +35,7 @@ TARGET = BootloaderDFU
SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB) SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB)
LUFA_PATH = ../../LUFA/ LUFA_PATH = ../../LUFA/
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START) CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START)
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START) -Wl,--section-start=.apitable=$(BOOT_API_TABLESTART) -Wl,--undefined=BootloaderAPI_JumpTable LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START) $(BOOT_API_LD_FLAGS)
# Default target # Default target
all: all: