Reset version information now that the LUFA-130303 release has been tagged.

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

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index c67e762..53a83dd 100644 (file)
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2013.
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
@@ -9,6 +9,8 @@
 #         LUFA Project Makefile.
 # --------------------------------------
 
+# Run "make help" for target help.
+
 MCU          = at90usb1287
 ARCH         = AVR8
 BOARD        = USBKEY
@@ -27,10 +29,11 @@ LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAG
 FLASH_SIZE_KB         = 128
 BOOT_SECTION_SIZE_KB  = 8
 
-# Bootloader address calculation formulas (requires the "bc" unix utility)
-# Do not modify these macros, but rather modify the depedant values above.
-BOOT_START_OFFSET     = 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)
+# 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)) )
 
 # Bootloader linker section flags for relocating the API table sections to
 # known FLASH addresses - these should not normally be user-edited.