gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-21 19:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ChibiOS submodules. (#23405)

Browse Source
This commit is contained in:
Nick Brassel 2024-04-05 13:23:43 +11:00 committed by GitHub
parent 0696a62476
commit f8a7a6848d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/chibios

@ -1 +1 @@
Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51 Subproject commit be44b3305f9a9fe5f2f49a4e7b978db322dc463e

2
lib/chibios-contrib

@ -1 +1 @@
Subproject commit 9d7a7f904ed135e3459cf6d602db56a26872df6b Subproject commit 77cb0a4f7589f89e724f5e6ecb1d76d514dd1212

9
platforms/chibios/platform.mk
View File

@ -258,8 +258,8 @@ endif
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/hal/osal/rt/osal.mk # ChibiOS <= 19.x include $(CHIBIOS)/os/oslib/oslib.mk
-include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # ChibiOS >= 20.x include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
# RTOS files (optional). # RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
# Other files (optional). # Other files (optional).
@ -270,6 +270,7 @@ PLATFORM_SRC = \
$(KERNSRC) \ $(KERNSRC) \
$(PORTSRC) \ $(PORTSRC) \
$(OSALSRC) \ $(OSALSRC) \
$(OSLIBSRC) \
$(HALSRC) \ $(HALSRC) \
$(PLATFORMSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \ $(BOARDSRC) \
@ -285,11 +286,11 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM)
PLATFORM_SRC := $(patsubst $(TOP_DIR)/%,%,$(PLATFORM_SRC)) 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/$(BOARD)/configs \
$(TOP_DIR)/platforms/chibios/boards/common/configs \ $(TOP_DIR)/platforms/chibios/boards/common/configs \
$(HALCONFDIR) $(CHCONFDIR) \ $(HALCONFDIR) $(CHCONFDIR) \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) $(OSLIBINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH) $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH)