diff options
author | Nick Brassel <[email protected]> | 2024-04-05 13:23:43 +1100 |
---|---|---|
committer | GitHub <[email protected]> | 2024-04-05 13:23:43 +1100 |
commit | f8a7a6848d737b01dcb5843503bcabcdd68cdb01 (patch) | |
tree | d9f664343f1f1dd8b766ba715c70f59db1a1e809 | |
parent | 0696a624764363d48e98286ba27e200e18db1ffa (diff) | |
download | qmk_firmware-f8a7a6848d737b01dcb5843503bcabcdd68cdb01.tar.gz qmk_firmware-f8a7a6848d737b01dcb5843503bcabcdd68cdb01.zip |
Update ChibiOS submodules. (#23405)
m--------- | lib/chibios | 0 | ||||
m--------- | lib/chibios-contrib | 0 | ||||
-rw-r--r-- | platforms/chibios/platform.mk | 9 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/chibios b/lib/chibios -Subproject 11edb1610980f213b9f83161e1715a46fb7e4c5 +Subproject be44b3305f9a9fe5f2f49a4e7b978db322dc463 diff --git a/lib/chibios-contrib b/lib/chibios-contrib -Subproject 9d7a7f904ed135e3459cf6d602db56a26872df6 +Subproject 77cb0a4f7589f89e724f5e6ecb1d76d514dd121 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) |