1 files changed, 75 insertions, 75 deletions
diff --git a/lib/lufa/Bootloaders/MassStorage/makefile b/lib/lufa/Bootloaders/MassStorage/makefile
index 7f0ec82a7..f3948e754 100644
--- a/lib/lufa/Bootloaders/MassStorage/makefile
+++ b/lib/lufa/Bootloaders/MassStorage/makefile
@@ -1,75 +1,75 @@
-#
+#
-#             LUFA Library
+#             LUFA Library
-#     Copyright (C) Dean Camera, 2017.
+#     Copyright (C) Dean Camera, 2017.
-#
+#
-#  dean [at] fourwalledcubicle [dot] com
+#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
+#           www.lufa-lib.org
-#
+#
-# --------------------------------------
+# --------------------------------------
-#         LUFA Project Makefile.
+#         LUFA Project Makefile.
-# --------------------------------------
+# --------------------------------------
-# Run "make help" for target help.
+# Run "make help" for target help.
-MCU          = at90usb1287
+MCU          = at90usb1287
-ARCH         = AVR8
+ARCH         = AVR8
-BOARD        = USBKEY
+BOARD        = USBKEY
-F_CPU        = 8000000
+F_CPU        = 8000000
-F_USB        = $(F_CPU)
+F_USB        = $(F_CPU)
-OPTIMIZATION = s
+OPTIMIZATION = s
-TARGET       = BootloaderMassStorage
+TARGET       = BootloaderMassStorage
-SRC          = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Lib/SCSI.c Lib/VirtualFAT.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
+SRC          = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Lib/SCSI.c Lib/VirtualFAT.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH    = ../../LUFA
+LUFA_PATH    = ../../LUFA
-CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)
+CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)
-LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)
+LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)
-# Flash size and bootloader section sizes of the target, in KB. These must
+# 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
+# match the target's total FLASH size and the bootloader size set in the
-# device's fuses.
+# device's fuses.
-FLASH_SIZE_KB         = 128
+FLASH_SIZE_KB         = 128
-BOOT_SECTION_SIZE_KB  = 8
+BOOT_SECTION_SIZE_KB  = 8
-# Bootloader address calculation formulas
+# Bootloader address calculation formulas
-# Do not modify these macros, but rather modify the dependent values above.
+# Do not modify these macros, but rather modify the dependent values above.
-CALC_ADDRESS_IN_HEX   = $(shell printf "0x%X" $$(( $(1) )) )
+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_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))) )
+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.
-BOOT_SECTION_LD_FLAG  = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2))
+BOOT_SECTION_LD_FLAG  = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2))
-BOOT_API_LD_FLAGS     = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96)
+BOOT_API_LD_FLAGS     = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96)
-BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable,   BootloaderAPI_JumpTable,   32)
+BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable,   BootloaderAPI_JumpTable,   32)
-BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures,  BootloaderAPI_Signatures,  8)
+BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures,  BootloaderAPI_Signatures,  8)
-# Check if the bootloader needs an AUX section, located before the real bootloader section to store some of the
+# Check if the bootloader needs an AUX section, located before the real bootloader section to store some of the
-# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum
+# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum
-# bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices.
+# bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices.
-ifeq ($(BOOT_SECTION_SIZE_KB),8)
+ifeq ($(BOOT_SECTION_SIZE_KB),8)
-  CC_FLAGS           += -DAUX_BOOT_SECTION_SIZE=0
+  CC_FLAGS           += -DAUX_BOOT_SECTION_SIZE=0
-else
+else
-  AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))
+  AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))
-  CC_FLAGS           += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)'
+  CC_FLAGS           += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)'
-  LD_FLAGS           += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16))
+  LD_FLAGS           += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16))
-  LD_FLAGS           += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024)
+  LD_FLAGS           += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024)
-endif
+endif
-# Default target
+# Default target
-all:
+all:
-# Include LUFA-specific DMBS extension modules
+# Include LUFA-specific DMBS extension modules
-DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
+DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
-include $(DMBS_LUFA_PATH)/lufa-sources.mk
+include $(DMBS_LUFA_PATH)/lufa-sources.mk
-include $(DMBS_LUFA_PATH)/lufa-gcc.mk
+include $(DMBS_LUFA_PATH)/lufa-gcc.mk
-# Include common DMBS build system modules
+# Include common DMBS build system modules
-DMBS_PATH      ?= $(LUFA_PATH)/Build/DMBS/DMBS
+DMBS_PATH      ?= $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/core.mk
+include $(DMBS_PATH)/core.mk
-include $(DMBS_PATH)/cppcheck.mk
+include $(DMBS_PATH)/cppcheck.mk
-include $(DMBS_PATH)/doxygen.mk
+include $(DMBS_PATH)/doxygen.mk
-include $(DMBS_PATH)/dfu.mk
+include $(DMBS_PATH)/dfu.mk
-include $(DMBS_PATH)/gcc.mk
+include $(DMBS_PATH)/gcc.mk
-include $(DMBS_PATH)/hid.mk
+include $(DMBS_PATH)/hid.mk
-include $(DMBS_PATH)/avrdude.mk
+include $(DMBS_PATH)/avrdude.mk
-include $(DMBS_PATH)/atprogram.mk
+include $(DMBS_PATH)/atprogram.mk

diff --git a/lib/lufa/Bootloaders/MassStorage/makefile b/lib/lufa/Bootloaders/MassStorage/makefile index 7f0ec82a7..f3948e754 100644 --- a/lib/lufa/Bootloaders/MassStorage/makefile +++ b/lib/lufa/Bootloaders/MassStorage/makefile
@@ -1,75 +1,75 @@
1	#	1	#
2	# LUFA Library	2	# LUFA Library
3	# Copyright (C) Dean Camera, 2017.	3	# Copyright (C) Dean Camera, 2017.
4	#	4	#
5	# dean [at] fourwalledcubicle [dot] com	5	# dean [at] fourwalledcubicle [dot] com
6	# www.lufa-lib.org	6	# www.lufa-lib.org
7	#	7	#
8	# --------------------------------------	8	# --------------------------------------
9	# LUFA Project Makefile.	9	# LUFA Project Makefile.
10	# --------------------------------------	10	# --------------------------------------
11		11
12	# Run "make help" for target help.	12	# Run "make help" for target help.
13		13
14	MCU = at90usb1287	14	MCU = at90usb1287
15	ARCH = AVR8	15	ARCH = AVR8
16	BOARD = USBKEY	16	BOARD = USBKEY
17	F_CPU = 8000000	17	F_CPU = 8000000
18	F_USB = $(F_CPU)	18	F_USB = $(F_CPU)
19	OPTIMIZATION = s	19	OPTIMIZATION = s
20	TARGET = BootloaderMassStorage	20	TARGET = BootloaderMassStorage
21	SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Lib/SCSI.c Lib/VirtualFAT.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)	21	SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Lib/SCSI.c Lib/VirtualFAT.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
22	LUFA_PATH = ../../LUFA	22	LUFA_PATH = ../../LUFA
23	CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)	23	CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)
24	LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)	24	LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)
25		25
26	# Flash size and bootloader section sizes of the target, in KB. These must	26	# Flash size and bootloader section sizes of the target, in KB. These must
27	# match the target's total FLASH size and the bootloader size set in the	27	# match the target's total FLASH size and the bootloader size set in the
28	# device's fuses.	28	# device's fuses.
29	FLASH_SIZE_KB = 128	29	FLASH_SIZE_KB = 128
30	BOOT_SECTION_SIZE_KB = 8	30	BOOT_SECTION_SIZE_KB = 8
31		31
32	# Bootloader address calculation formulas	32	# Bootloader address calculation formulas
33	# Do not modify these macros, but rather modify the dependent values above.	33	# Do not modify these macros, but rather modify the dependent values above.
34	CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) )	34	CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) )
35	BOOT_START_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 )	35	BOOT_START_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 )
36	BOOT_SEC_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - ($(strip $(1))) )	36	BOOT_SEC_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - ($(strip $(1))) )
37		37
38	# Bootloader linker section flags for relocating the API table sections to	38	# Bootloader linker section flags for relocating the API table sections to
39	# known FLASH addresses - these should not normally be user-edited.	39	# known FLASH addresses - these should not normally be user-edited.
40	BOOT_SECTION_LD_FLAG = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2))	40	BOOT_SECTION_LD_FLAG = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2))
41	BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96)	41	BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96)
42	BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable, BootloaderAPI_JumpTable, 32)	42	BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable, BootloaderAPI_JumpTable, 32)
43	BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8)	43	BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8)
44		44
45	# Check if the bootloader needs an AUX section, located before the real bootloader section to store some of the	45	# Check if the bootloader needs an AUX section, located before the real bootloader section to store some of the
46	# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum	46	# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum
47	# bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices.	47	# bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices.
48	ifeq ($(BOOT_SECTION_SIZE_KB),8)	48	ifeq ($(BOOT_SECTION_SIZE_KB),8)
49	CC_FLAGS += -DAUX_BOOT_SECTION_SIZE=0	49	CC_FLAGS += -DAUX_BOOT_SECTION_SIZE=0
50	else	50	else
51	AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))	51	AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))
52		52
53	CC_FLAGS += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)'	53	CC_FLAGS += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)'
54	LD_FLAGS += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16))	54	LD_FLAGS += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16))
55	LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024)	55	LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024)
56	endif	56	endif
57		57
58	# Default target	58	# Default target
59	all:	59	all:
60		60
61	# Include LUFA-specific DMBS extension modules	61	# Include LUFA-specific DMBS extension modules
62	DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA	62	DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
63	include $(DMBS_LUFA_PATH)/lufa-sources.mk	63	include $(DMBS_LUFA_PATH)/lufa-sources.mk
64	include $(DMBS_LUFA_PATH)/lufa-gcc.mk	64	include $(DMBS_LUFA_PATH)/lufa-gcc.mk
65		65
66	# Include common DMBS build system modules	66	# Include common DMBS build system modules
67	DMBS_PATH ?= $(LUFA_PATH)/Build/DMBS/DMBS	67	DMBS_PATH ?= $(LUFA_PATH)/Build/DMBS/DMBS
68	include $(DMBS_PATH)/core.mk	68	include $(DMBS_PATH)/core.mk
69	include $(DMBS_PATH)/cppcheck.mk	69	include $(DMBS_PATH)/cppcheck.mk
70	include $(DMBS_PATH)/doxygen.mk	70	include $(DMBS_PATH)/doxygen.mk
71	include $(DMBS_PATH)/dfu.mk	71	include $(DMBS_PATH)/dfu.mk
72	include $(DMBS_PATH)/gcc.mk	72	include $(DMBS_PATH)/gcc.mk
73	include $(DMBS_PATH)/hid.mk	73	include $(DMBS_PATH)/hid.mk
74	include $(DMBS_PATH)/avrdude.mk	74	include $(DMBS_PATH)/avrdude.mk
75	include $(DMBS_PATH)/atprogram.mk	75	include $(DMBS_PATH)/atprogram.mk