Skip to content

Commit 4f66a7a

Browse files
authored
Merge pull request abcminiuser#4 from drashna/update_master
Update master
2 parents ce10f76 + 0dfd135 commit 4f66a7a

126 files changed

Lines changed: 17912 additions & 7086 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Bootloaders/CDC/doxyfile

Lines changed: 216 additions & 84 deletions
Large diffs are not rendered by default.

Bootloaders/CDC/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(
2222
LUFA_PATH = ../../LUFA
2323
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)
2424
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)
25+
LTO = Y
2526

2627
# Flash size and bootloader section sizes of the target, in KB. These must
2728
# match the target's total FLASH size and the bootloader size set in the

Bootloaders/DFU/doxyfile

Lines changed: 216 additions & 84 deletions
Large diffs are not rendered by default.

Bootloaders/DFU/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(
2222
LUFA_PATH = ../../LUFA
2323
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)
2424
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)
25+
LTO = Y
2526

2627
# Flash size and bootloader section sizes of the target, in KB. These must
2728
# match the target's total FLASH size and the bootloader size set in the

Bootloaders/HID/doxyfile

Lines changed: 216 additions & 84 deletions
Large diffs are not rendered by default.

Bootloaders/HID/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
2222
LUFA_PATH = ../../LUFA
2323
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -DBOOT_START_ADDR=$(BOOT_START_OFFSET) -IConfig/
2424
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET)
25+
LTO = Y
2526

2627
# Flash size and bootloader section sizes of the target, in KB. These must
2728
# match the target's total FLASH size and the bootloader size set in the

Bootloaders/MassStorage/Lib/VirtualFAT.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
(uint8_t)(ROT8(ROT8(ROT8(ROT8(ROT8(ROT8(ROT8(ROT8(ROT8(ROT8(n0)+n1)+n2)+n3)+n4)+n5)+n6)+n7)+e0)+e1)+e2)
127127

128128
/** \name FAT Filesystem Flags */
129-
//@{
129+
/**@{*/
130130
/** FAT attribute flag to indicate a read-only file. */
131131
#define FAT_FLAG_READONLY (1 << 0)
132132

@@ -150,7 +150,7 @@
150150

151151
/** Ordinal flag marker for FAT Long File Name entries to mark the last entry. */
152152
#define FAT_ORDINAL_LAST_ENTRY (1 << 6)
153-
//@}
153+
/**@}*/
154154

155155
/* Enums: */
156156
/** Enum for the Root FAT file entry indexes on the disk. This can be used

Bootloaders/MassStorage/doxyfile

Lines changed: 216 additions & 84 deletions
Large diffs are not rendered by default.

Bootloaders/MassStorage/makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Li
2222
LUFA_PATH = ../../LUFA
2323
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)
2424
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)
25+
LTO = Y
2526

2627
# Flash size and bootloader section sizes of the target, in KB. These must
2728
# match the target's total FLASH size and the bootloader size set in the
@@ -43,12 +44,12 @@ BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable, Boot
4344
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8)
4445

4546
# 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
47+
# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 8KB but the maximum
4748
# bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices.
4849
ifeq ($(BOOT_SECTION_SIZE_KB),8)
4950
CC_FLAGS += -DAUX_BOOT_SECTION_SIZE=0
5051
else
51-
AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))
52+
AUX_BOOT_SECTION_SIZE_KB = (8 - $(BOOT_SECTION_SIZE_KB))
5253

5354
CC_FLAGS += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)'
5455
LD_FLAGS += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16))

Bootloaders/Printer/doxyfile

Lines changed: 216 additions & 84 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)