ignore HID Bootloader upload tool

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

diff --git a/Bootloaders/HID/makefile b/Bootloaders/HID/makefile
index 8df1c3f..6589d75 100644 (file)
--- a/Bootloaders/HID/makefile
+++ b/Bootloaders/HID/makefile
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
 #
 #             LUFA Library

-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2014.

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


@@ -9,16 +9,7 @@
 #         LUFA Project Makefile.
 # --------------------------------------
 
 #         LUFA Project Makefile.
 # --------------------------------------
 

-# 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
-
-# Bootloader address calculations (requires the "bc" unix utility) - do
-# not modify these calculations, but rather modify the depedant values above.
-BOOT_START           := 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc)
-
+# Run "make help" for target help.

 
 MCU          = at90usb1287
 ARCH         = AVR8
 
 MCU          = at90usb1287
 ARCH         = AVR8


@@ -28,18 +19,30 @@ F_USB        = $(F_CPU)
 OPTIMIZATION = s
 TARGET       = BootloaderHID
 SRC          = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
 OPTIMIZATION = s
 TARGET       = BootloaderHID
 SRC          = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)

-LUFA_PATH    = ../../LUFA/
+LUFA_PATH    = ../../LUFA

 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/

-LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START)
+LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET)
+
+# 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
+
+# Bootloader address calculation formulas
+# 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))) )

 
 # Default target
 all:
 
 # Include LUFA build script makefiles
 
 # Default target
 all:
 
 # Include LUFA build script makefiles

-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.atprogram.in
+include $(LUFA_PATH)/Build/lufa_core.mk
+include $(LUFA_PATH)/Build/lufa_sources.mk
+include $(LUFA_PATH)/Build/lufa_build.mk
+include $(LUFA_PATH)/Build/lufa_cppcheck.mk
+include $(LUFA_PATH)/Build/lufa_doxygen.mk
+include $(LUFA_PATH)/Build/lufa_avrdude.mk
+include $(LUFA_PATH)/Build/lufa_atprogram.mk