Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ChibiOS submodules. #23405

Merged
merged 4 commits into from
Apr 5, 2024
Merged

Update ChibiOS submodules. #23405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d206f7
Update ChibiOS submodules.
tzarc Apr 3, 2024
73cf523
Fixup makefiles.
tzarc Apr 3, 2024
0254e44
I think we're well past ChibiOS 19 at this point.
tzarc Apr 3, 2024
6638f86
Yet again we receive new blessings from -Contrib.
tzarc Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/chibios
Open in desktop
Submodule chibios updated 105 files
2 changes: 1 addition & 1 deletion lib/chibios-contrib
Open in desktop
Submodule chibios-contrib updated 419 files
9 changes: 5 additions & 4 deletions platforms/chibios/platform.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -270,6 +270,7 @@ PLATFORM_SRC = \
$(KERNSRC) \
$(PORTSRC) \
$(OSALSRC) \
$(OSLIBSRC) \
$(HALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
Expand All @@ -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)

Expand Down
Loading