Update to latest Atmel Studio integration binary, improve Getting Started page in...

[pub/USBasp.git] / Bootloaders / Printer / makefile

diff --git a/Bootloaders/Printer/makefile b/Bootloaders/Printer/makefile
index 0deec3e..0716c3b 100644 (file)
--- a/Bootloaders/Printer/makefile
+++ b/Bootloaders/Printer/makefile
@@ -1,6 +1,6 @@
 #\r
 #             LUFA Library\r
 #\r
 #             LUFA Library\r

-#     Copyright (C) Dean Camera, 2013.\r
+#     Copyright (C) Dean Camera, 2014.\r

 #\r
 #  dean [at] fourwalledcubicle [dot] com\r
 #           www.lufa-lib.org\r
 #\r
 #  dean [at] fourwalledcubicle [dot] com\r
 #           www.lufa-lib.org\r


@@ -18,7 +18,7 @@ F_CPU        = 8000000
 F_USB        = $(F_CPU)\r
 OPTIMIZATION = s\r
 TARGET       = BootloaderPrinter\r
 F_USB        = $(F_CPU)\r
 OPTIMIZATION = s\r
 TARGET       = BootloaderPrinter\r

-SRC          = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)\r
+SRC          = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)\r

 LUFA_PATH    = ../../LUFA\r
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)\r
 LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)\r
 LUFA_PATH    = ../../LUFA\r
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)\r
 LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)\r


@@ -33,7 +33,14 @@ BOOT_SECTION_SIZE_KB  = 8
 # Do not modify these macros, but rather modify the dependent values above.\r
 CALC_ADDRESS_IN_HEX   = $(shell printf "0x%X" $$(( $(1) )) )\r
 BOOT_START_OFFSET     = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 )\r
 # Do not modify these macros, but rather modify the dependent values above.\r
 CALC_ADDRESS_IN_HEX   = $(shell printf "0x%X" $$(( $(1) )) )\r
 BOOT_START_OFFSET     = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 )\r

-BOOT_SEC_OFFSET       = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - $(strip $(1)) )\r
+BOOT_SEC_OFFSET       = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - ($(strip $(1))) )\r
+\r
+# Bootloader linker section flags for relocating the API table sections to\r
+# known FLASH addresses - these should not normally be user-edited.\r
+BOOT_SECTION_LD_FLAG  = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2))\r
+BOOT_API_LD_FLAGS     = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96)\r
+BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable,   BootloaderAPI_JumpTable,   32)\r
+BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures,  BootloaderAPI_Signatures,  8)\r

 \r
 # Default target\r
 all:\r
 \r
 # Default target\r
 all:\r