qmk_firmware

commit: f8a7a6848d737b01dcb5843503bcabcdd68cdb01
parent 0696a624764363d48e98286ba27e200e18db1ffa
Author: Nick Brassel <nick@tzarc.org>
Date:   Fri,  5 Apr 2024 13:23:43 +1100

Update ChibiOS submodules. (#23405)


Diffstat:
M
platforms/chibios/platform.mk
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git 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)