From 44f1bd9b3a9185951c283ceb5eeb2ecc2be72418 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 7 Mar 2022 21:04:22 +1100
Subject: ChibiOS 21.11.1 update. (#16251)

* ChibiOS 21.11.1 update.

* `uf2-tinyuf2` => `tinyuf2`

* Updated chibios-contrib, fixup preprocessor for tinyuf2 bootloader.

* Fixup keychron L433 boards.

* Makefile cleanup.

* RISC-V build fixes.

* Fixup RISC-V build.
---
 builddefs/common_rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'builddefs/common_rules.mk')

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index b303a87919..85dfe67f3f 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -316,7 +316,7 @@ gccversion :
 	@$(BUILD_CMD)
 
 %.uf2: %.hex
-	$(eval CMD=$(UF2CONV) $(BUILD_DIR)/$(TARGET).hex -o $(BUILD_DIR)/$(TARGET).uf2 -c -f $(UF2_FAMILY) >/dev/null 2>&1)
+	$(eval CMD=$(UF2CONV) $(BUILD_DIR)/$(TARGET).hex --output $(BUILD_DIR)/$(TARGET).uf2 --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
 	#@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
 	@$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD)
 	@$(BUILD_CMD)
-- 
cgit v1.2.3


From 581628892600c422796ee4ad4ccf40d32a28b3af Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 16 May 2022 15:29:55 +1000
Subject: Warn about LTO with arm_atsam, not ChibiOS. (#17106)

---
 builddefs/common_rules.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'builddefs/common_rules.mk')

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index 85dfe67f3f..d3acddc87b 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -82,8 +82,8 @@ endif
 #  -Wall...:     warning level
 #  -Wa,...:      tell GCC to pass this to the assembler.
 ifeq ($(strip $(LTO_ENABLE)), yes)
-    ifeq ($(PLATFORM),CHIBIOS)
-        $(info Enabling LTO on ChibiOS-targeting boards is known to have a high likelihood of failure.)
+    ifeq ($(PLATFORM),ARM_ATSAM)
+        $(info Enabling LTO on arm_atsam-targeting boards is known to have a high likelihood of failure.)
         $(info If unsure, set LTO_ENABLE = no.)
     endif
     CDEFS += -flto
-- 
cgit v1.2.3