Build: Fix incorrect build target for Ubuntu CI builds.

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

diff --git a/Bootloaders/MassStorage/makefile b/Bootloaders/MassStorage/makefile
index 598486a..4a6e18e 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, 2019.\r
 #\r
 #  dean [at] fourwalledcubicle [dot] com\r
 #           www.lufa-lib.org\r
@@ -22,6 +22,7 @@ SRC          = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Li
 LUFA_PATH    = ../../LUFA\r
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)\r
 LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)\r
+LTO          = Y\r
 \r
 # Flash size and bootloader section sizes of the target, in KB. These must\r
 # match the target's total FLASH size and the bootloader size set in the\r
@@ -43,14 +44,14 @@ BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable,   Boot
 BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures,  BootloaderAPI_Signatures,  8)\r
 \r
 # Check if the bootloader needs an AUX section, located before the real bootloader section to store some of the\r
-# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum\r
+# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 8KB 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_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))\r
+  AUX_BOOT_SECTION_SIZE_KB = (8 - $(BOOT_SECTION_SIZE_KB))\r
 \r
-  CC_FLAGS           += -DAUX_BOOT_SECTION='__attribute__((section(".boot_aux")))' -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_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
@@ -58,11 +59,18 @@ endif
 # 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