Clean up bootloader makefiles to make them a bit more readable.

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

diff --git a/Bootloaders/HID/makefile b/Bootloaders/HID/makefile
index 8df1c3f..44ae028 100644 (file)
--- a/Bootloaders/HID/makefile
+++ b/Bootloaders/HID/makefile
@@ -9,17 +9,6 @@
 #         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)
-
-

 MCU          = at90usb1287
 ARCH         = AVR8
 BOARD        = USBKEY
 MCU          = at90usb1287
 ARCH         = AVR8
 BOARD        = USBKEY


@@ -30,7 +19,18 @@ TARGET       = BootloaderHID
 SRC          = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
 LUFA_PATH    = ../../LUFA/
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/
 SRC          = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
 LUFA_PATH    = ../../LUFA/
 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 (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)

 
 # Default target
 all:
 
 # Default target
 all: