Clean up DOXYGEN and SOURCES build system modules - use non-recursively evaluated...

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

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 22ae1d6..3ee61fc 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -9,19 +9,21 @@
 #         LUFA Project Makefile.
 # --------------------------------------
 
 #         LUFA Project Makefile.
 # --------------------------------------
 

-# Starting byte address of the bootloader, as a byte address - computed via the formula
-#   BOOT_START = ((FLASH_SIZE_KB - BOOT_SECTION_SIZE_KB) * 1024)
-#
-# Note that the bootloader size and start address given in AVRStudio is in words and not
-# bytes, and so will need to be doubled to obtain the byte address needed by AVR-GCC.
-FLASH_SIZE_KB        = 128
-BOOT_SECTION_SIZE_KB = 8
+# Flash size and bootloader section sizes of the target, in KB. These must
+# match the target's total FLASH size and the bootloader size set in the
+# device's fuses.
+FLASH_SIZE_KB        := 128
+BOOT_SECTION_SIZE_KB := 8

 
 

-# Formulas used to calculate the starting address of the Bootloader section, and the User Application
-# API jump table (for more information on the latter, see the bootloader documentation). These formulas
-# should not need to be altered - modify the FLASH_SIZE_KB and BOOT_SECTION_KB values above instead.
-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)
+# Bootloader address calculations (requires the "bc" unix utility) and
+# 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_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
 ARCH         = AVR8
 
 MCU          = at90usb1287
 ARCH         = AVR8


@@ -33,7 +35,7 @@ TARGET       = BootloaderDFU
 SRC          = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB)
 LUFA_PATH    = ../../LUFA/
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START)
 SRC          = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB)
 LUFA_PATH    = ../../LUFA/
 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
 all:
 
 # Default target
 all:


@@ -42,5 +44,7 @@ all:
 include $(LUFA_PATH)/Build/lufa.core.in
 include $(LUFA_PATH)/Build/lufa.sources.in
 include $(LUFA_PATH)/Build/lufa.build.in
 include $(LUFA_PATH)/Build/lufa.core.in
 include $(LUFA_PATH)/Build/lufa.sources.in
 include $(LUFA_PATH)/Build/lufa.build.in

+include $(LUFA_PATH)/Build/lufa.cppcheck.in

 include $(LUFA_PATH)/Build/lufa.doxygen.in
 include $(LUFA_PATH)/Build/lufa.avrdude.in
 include $(LUFA_PATH)/Build/lufa.doxygen.in
 include $(LUFA_PATH)/Build/lufa.avrdude.in

+include $(LUFA_PATH)/Build/lufa.atprogram.in