diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-03-18 17:21:02 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-03-18 17:21:02 +0000 |
| commit | 170328389372f9d0dd209e2e398d227c4c5f67ca (patch) | |
| tree | 6af29fb07c4324c7999424e672e5e51f01631008 /Bootloaders/CDC/makefile | |
| parent | be33d3a5156ea3fde221c9e174ad0405eb8d1f8d (diff) | |
| download | lufa-170328389372f9d0dd209e2e398d227c4c5f67ca.tar.gz lufa-170328389372f9d0dd209e2e398d227c4c5f67ca.tar.bz2 lufa-170328389372f9d0dd209e2e398d227c4c5f67ca.zip | |
Ensure bootloader makefile calculation functions are uniform across all bootloaders.
Diffstat (limited to 'Bootloaders/CDC/makefile')
| -rw-r--r-- | Bootloaders/CDC/makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 53a83ddad..d636d64b8 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -33,14 +33,14 @@ BOOT_SECTION_SIZE_KB = 8 # Do not modify these macros, but rather modify the dependent values above. CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) ) BOOT_START_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 ) -BOOT_SEC_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - $(strip $(1)) ) +BOOT_SEC_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - ($(strip $(1))) ) # Bootloader linker section flags for relocating the API table sections to # known FLASH addresses - these should not normally be user-edited. -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, 96) -BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, jumptable, JumpTable, 32) -BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, signatures, Signatures, 8) +BOOT_SECTION_LD_FLAG = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2)) +BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96) +BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable, BootloaderAPI_JumpTable, 32) +BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8) # Default target all: |