Diff
1diff --git a/lib/chibios b/lib/chibios
2index 11edb1610980f213b9f83161e1715a46fb7e4c51..be44b3305f9a9fe5f2f49a4e7b978db322dc463e 160000
3--- a/lib/chibios
4+++ b/lib/chibios
5@@ -1 +1 @@
6-Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51
7+Subproject commit be44b3305f9a9fe5f2f49a4e7b978db322dc463e
8diff --git a/lib/chibios-contrib b/lib/chibios-contrib
9index 9d7a7f904ed135e3459cf6d602db56a26872df6b..77cb0a4f7589f89e724f5e6ecb1d76d514dd1212 160000
10--- a/lib/chibios-contrib
11+++ b/lib/chibios-contrib
12@@ -1 +1 @@
13-Subproject commit 9d7a7f904ed135e3459cf6d602db56a26872df6b
14+Subproject commit 77cb0a4f7589f89e724f5e6ecb1d76d514dd1212
15diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
16index b13eed39be8d2aa0b43359caca3e891ea5af91e6..169707966ff84f305a8dffb65f34dccb5a08d4ed 100644
17--- a/platforms/chibios/platform.mk
18+++ b/platforms/chibios/platform.mk
19@@ -258,8 +258,8 @@ endif
20
21 # HAL-OSAL files (optional).
22 include $(CHIBIOS)/os/hal/hal.mk
23--include $(CHIBIOS)/os/hal/osal/rt/osal.mk # ChibiOS <= 19.x
24--include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # ChibiOS >= 20.x
25+include $(CHIBIOS)/os/oslib/oslib.mk
26+include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
27 # RTOS files (optional).
28 include $(CHIBIOS)/os/rt/rt.mk
29 # Other files (optional).
30@@ -270,6 +270,7 @@ PLATFORM_SRC = \
31 $(KERNSRC) \
32 $(PORTSRC) \
33 $(OSALSRC) \
34+ $(OSLIBSRC) \
35 $(HALSRC) \
36 $(PLATFORMSRC) \
37 $(BOARDSRC) \
38@@ -285,11 +286,11 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM)
39
40 PLATFORM_SRC := $(patsubst $(TOP_DIR)/%,%,$(PLATFORM_SRC))
41
42-EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \
43+EXTRAINCDIRS += $(CHIBIOS)/os/license \
44 $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \
45 $(TOP_DIR)/platforms/chibios/boards/common/configs \
46 $(HALCONFDIR) $(CHCONFDIR) \
47- $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
48+ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) $(OSLIBINC) \
49 $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
50 $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH)
51