diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-11-10 16:47:04 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-11-10 16:47:04 +0000 |
| commit | c786d8a0b7845eefc42df1c6dc3ea91c8785ad84 (patch) | |
| tree | 0101b88b57fddf38cd5332ac0320e08032b13902 /Bootloaders | |
| parent | 9740d3a55f1e5dc297aeddbb3c822831a426c658 (diff) | |
| download | lufa-c786d8a0b7845eefc42df1c6dc3ea91c8785ad84.tar.gz lufa-c786d8a0b7845eefc42df1c6dc3ea91c8785ad84.tar.bz2 lufa-c786d8a0b7845eefc42df1c6dc3ea91c8785ad84.zip | |
Remove dependency on the "bc" command line calculator tool in the bootloaders to make compiling on Windows easier with only MinGW.
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/makefile | 5 | ||||
| -rw-r--r-- | Bootloaders/DFU/makefile | 7 | ||||
| -rw-r--r-- | Bootloaders/HID/makefile | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index b34745c81..97b714d0b 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -31,8 +31,9 @@ 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) +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. diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 049909c01..f0d5a45ad 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -31,8 +31,9 @@ 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) +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. @@ -43,7 +44,7 @@ BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, signatures, Signatures, 8 # Default target all: - + # Include LUFA build script makefiles include $(LUFA_PATH)/Build/lufa_core.mk include $(LUFA_PATH)/Build/lufa_sources.mk diff --git a/Bootloaders/HID/makefile b/Bootloaders/HID/makefile index 02b884a31..baa14279e 100644 --- a/Bootloaders/HID/makefile +++ b/Bootloaders/HID/makefile @@ -31,8 +31,9 @@ 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) +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: |