Fix warning about possible string truncation in the TempDataLogger project.

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

diff --git a/Bootloaders/MassStorage/makefile b/Bootloaders/MassStorage/makefile
index edf565d..095c689 100644 (file)
--- a/Bootloaders/MassStorage/makefile
+++ b/Bootloaders/MassStorage/makefile
@@ -1,6 +1,6 @@
 #\r
 #             LUFA Library\r
-#     Copyright (C) Dean Camera, 2013.\r
+#     Copyright (C) Dean Camera, 2018.\r
 #\r
 #  dean [at] fourwalledcubicle [dot] com\r
 #           www.lufa-lib.org\r
@@ -46,23 +46,30 @@ BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures,  Boot
 # bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum\r
 # bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices.\r
 ifeq ($(BOOT_SECTION_SIZE_KB),8)\r
-  CC_FLAGS           += -DAUX_BOOT_SECTION='' -DAUX_BOOT_SECTION_SIZE=0\r
+  CC_FLAGS           += -DAUX_BOOT_SECTION_SIZE=0\r
 else\r
-  AUX_BOOT_SECTION_KB = (6 - $(BOOT_SECTION_SIZE_KB))\r
+  AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))\r
 \r
-  CC_FLAGS           += -DAUX_BOOT_SECTION='__attribute__((section(".boot_aux")))' -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_KB) * 1024)'\r
-  LD_FLAGS           += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_KB)) * 1024 - 16))\r
-  LD_FLAGS           += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_KB)) * 1024)\r
+  CC_FLAGS           += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)'\r
+  LD_FLAGS           += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16))\r
+  LD_FLAGS           += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024)\r
 endif\r
 \r
 # Default target\r
 all:\r
 \r
-# Include LUFA build script makefiles\r
-include $(LUFA_PATH)/Build/lufa_core.mk\r
-include $(LUFA_PATH)/Build/lufa_sources.mk\r
-include $(LUFA_PATH)/Build/lufa_build.mk\r
-include $(LUFA_PATH)/Build/lufa_cppcheck.mk\r
-include $(LUFA_PATH)/Build/lufa_doxygen.mk\r
-include $(LUFA_PATH)/Build/lufa_avrdude.mk\r
-include $(LUFA_PATH)/Build/lufa_atprogram.mk\r
+# Include LUFA-specific DMBS extension modules\r
+DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA\r
+include $(DMBS_LUFA_PATH)/lufa-sources.mk\r
+include $(DMBS_LUFA_PATH)/lufa-gcc.mk\r
+\r
+# Include common DMBS build system modules\r
+DMBS_PATH      ?= $(LUFA_PATH)/Build/DMBS/DMBS\r
+include $(DMBS_PATH)/core.mk\r
+include $(DMBS_PATH)/cppcheck.mk\r
+include $(DMBS_PATH)/doxygen.mk\r
+include $(DMBS_PATH)/dfu.mk\r
+include $(DMBS_PATH)/gcc.mk\r
+include $(DMBS_PATH)/hid.mk\r
+include $(DMBS_PATH)/avrdude.mk\r
+include $(DMBS_PATH)/atprogram.mk\r