From 2d206f7413b7ced88d81e682ccf318052cb70d6b Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 3 Apr 2024 20:28:52 +1100
Subject: [PATCH 1/4] Update ChibiOS submodules.

---
 lib/chibios         | 2 +-
 lib/chibios-contrib | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/chibios b/lib/chibios
index 11edb1610980..be44b3305f9a 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51
+Subproject commit be44b3305f9a9fe5f2f49a4e7b978db322dc463e
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 9d7a7f904ed1..91aefa4b13ad 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 9d7a7f904ed135e3459cf6d602db56a26872df6b
+Subproject commit 91aefa4b13ad7a83affed8f28012e3effd0eb7c8

From 73cf52341c780ad0696ba169a6e8287a32c32bf2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 3 Apr 2024 20:44:42 +1100
Subject: [PATCH 2/4] Fixup makefiles.

---
 platforms/chibios/platform.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index b13eed39be8d..c5f05047da27 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -258,6 +258,7 @@ endif
 
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/oslib/oslib.mk
 -include $(CHIBIOS)/os/hal/osal/rt/osal.mk         # ChibiOS <= 19.x
 -include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk     # ChibiOS >= 20.x
 # RTOS files (optional).
@@ -270,6 +271,7 @@ PLATFORM_SRC = \
         $(KERNSRC) \
         $(PORTSRC) \
         $(OSALSRC) \
+        $(OSLIBSRC) \
         $(HALSRC) \
         $(PLATFORMSRC) \
         $(BOARDSRC) \
@@ -285,11 +287,11 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM)
 
 PLATFORM_SRC := $(patsubst $(TOP_DIR)/%,%,$(PLATFORM_SRC))
 
-EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \
+EXTRAINCDIRS += $(CHIBIOS)/os/license \
          $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \
          $(TOP_DIR)/platforms/chibios/boards/common/configs \
          $(HALCONFDIR) $(CHCONFDIR) \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) $(OSLIBINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH)
 

From 0254e440566bbc3d795d85e4109bda94787e7962 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 3 Apr 2024 20:50:56 +1100
Subject: [PATCH 3/4] I think we're well past ChibiOS 19 at this point.

---
 platforms/chibios/platform.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index c5f05047da27..169707966ff8 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -259,8 +259,7 @@ endif
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/oslib/oslib.mk
--include $(CHIBIOS)/os/hal/osal/rt/osal.mk         # ChibiOS <= 19.x
--include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk     # ChibiOS >= 20.x
+include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 # Other files (optional).

From 6638f866067e2976921d3322b84ad5e4dfda873c Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 4 Apr 2024 13:54:16 +1100
Subject: [PATCH 4/4] Yet again we receive new blessings from -Contrib.

---
 lib/chibios-contrib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 91aefa4b13ad..77cb0a4f7589 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 91aefa4b13ad7a83affed8f28012e3effd0eb7c8
+Subproject commit 77cb0a4f7589f89e724f5e6ecb1d76d514dd1212