forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove dependency on the "bc" command line calculator tool in the bootloaders to make compiling on Windows easier with only MinGW.

Browse Source
pull/1469/head
Dean Camera 12 years ago
parent 9740d3a55f
commit c786d8a0b7
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

5
Bootloaders/CDC/makefile
Unescape View File

@ -31,8 +31,9 @@ BOOT_SECTION_SIZE_KB = 8
# Bootloader address calculation formulas (requires the "bc" unix utility) # Bootloader address calculation formulas (requires the "bc" unix utility)
# Do not modify these macros, but rather modify the depedant values above. # 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) CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) )
BOOT_SEC_OFFSET = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - $(strip $(1)))" | bc) 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 # Bootloader linker section flags for relocating the API table sections to
# known FLASH addresses - these should not normally be user-edited. # known FLASH addresses - these should not normally be user-edited.

5
Bootloaders/DFU/makefile
Unescape View File

@ -31,8 +31,9 @@ BOOT_SECTION_SIZE_KB = 8
# Bootloader address calculation formulas (requires the "bc" unix utility) # Bootloader address calculation formulas (requires the "bc" unix utility)
# Do not modify these macros, but rather modify the depedant values above. # 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) CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) )
BOOT_SEC_OFFSET = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - $(strip $(1)))" | bc) 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 # Bootloader linker section flags for relocating the API table sections to
# known FLASH addresses - these should not normally be user-edited. # known FLASH addresses - these should not normally be user-edited.

5
Bootloaders/HID/makefile
Unescape View File

@ -31,8 +31,9 @@ BOOT_SECTION_SIZE_KB := 8
# Bootloader address calculation formulas (requires the "bc" unix utility) # Bootloader address calculation formulas (requires the "bc" unix utility)
# Do not modify these macros, but rather modify the depedant values above. # 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) CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) )
BOOT_SEC_OFFSET = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - $(strip $(1)))" | bc) 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 # Default target
all: all:

1
LUFA/DoxygenPages/ChangeLog.txt
Unescape View File

@ -23,6 +23,7 @@
* via a software jump without first turning off the OTG pad (thanks to Simon Inns) * via a software jump without first turning off the OTG pad (thanks to Simon Inns)
* - Library Applications: * - Library Applications:
* - Increased throughput in the USBtoSerial project now that data transmission is non-blocking (thanks to Joseph Lacerte) * - Increased throughput in the USBtoSerial project now that data transmission is non-blocking (thanks to Joseph Lacerte)
* - Updated bootloader makefiles to remove dependency on the "bc" command line calculator tool
* *
* <b>Fixed:</b> * <b>Fixed:</b>
* - Core: * - Core:

4
LUFA/DoxygenPages/CompilingApps.txt
Unescape View File

@ -23,10 +23,6 @@
* of the MinGW installer (<a>http://www.mingw.org</a>). Once installed, add the "msys\1.0\bin" of the MinGW installation * of the MinGW installer (<a>http://www.mingw.org</a>). Once installed, add the "msys\1.0\bin" of the MinGW installation
* folder is added to your system's <b>PATH</b> environment variable. * folder is added to your system's <b>PATH</b> environment variable.
* *
* The bootloaders currently also require the \c bc command line application, which can be installed from
* <a>http://gnuwin32.sourceforge.net/downlinks/bc.php</a>. Once installed add the "GnuWin32\bin" path of the GnuWin32
* installation folder to your system's <b>PATH</b> environment variable.
*
* \subsection SSec_PreqLinux Linux Prerequisites * \subsection SSec_PreqLinux Linux Prerequisites
* On Linux systems you will need to install the latest Linux distribution of the standalone Atmel Toolchain from the * On Linux systems you will need to install the latest Linux distribution of the standalone Atmel Toolchain from the
* Atmel website (<a>http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORLINUX.aspx</a>), or use the latest avr-libc and avr-gcc packages * Atmel website (<a>http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORLINUX.aspx</a>), or use the latest avr-libc and avr-gcc packages

Write Preview
Loading…
Cancel
Save