From f8a7a6848d737b01dcb5843503bcabcdd68cdb01 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 5 Apr 2024 13:23:43 +1100 Subject: [PATCH] Update ChibiOS submodules. (#23405) --- lib/chibios | 2 +- lib/chibios-contrib | 2 +- platforms/chibios/platform.mk | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/chibios b/lib/chibios index 11edb16109..be44b3305f 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 9d7a7f904e..77cb0a4f75 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit 9d7a7f904ed135e3459cf6d602db56a26872df6b +Subproject commit 77cb0a4f7589f89e724f5e6ecb1d76d514dd1212 diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index b13eed39be..169707966f 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -258,8 +258,8 @@ endif # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.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/oslib/oslib.mk +include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk # Other files (optional). @@ -270,6 +270,7 @@ PLATFORM_SRC = \ $(KERNSRC) \ $(PORTSRC) \ $(OSALSRC) \ + $(OSLIBSRC) \ $(HALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ @@ -285,11 +286,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)