diff options
| author | Nick Brassel <nick@tzarc.org> | 2024-04-05 13:23:43 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-05 13:23:43 +1100 |
| commit | f8a7a6848d737b01dcb5843503bcabcdd68cdb01 (patch) | |
| tree | d9f664343f1f1dd8b766ba715c70f59db1a1e809 /platforms | |
| parent | 0696a624764363d48e98286ba27e200e18db1ffa (diff) | |
Update ChibiOS submodules. (#23405)
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/chibios/platform.mk | 9 |
1 files changed, 5 insertions, 4 deletions
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 | |||
| 258 | 258 | ||
| 259 | # HAL-OSAL files (optional). | 259 | # HAL-OSAL files (optional). |
| 260 | include $(CHIBIOS)/os/hal/hal.mk | 260 | include $(CHIBIOS)/os/hal/hal.mk |
| 261 | -include $(CHIBIOS)/os/hal/osal/rt/osal.mk # ChibiOS <= 19.x | 261 | include $(CHIBIOS)/os/oslib/oslib.mk |
| 262 | -include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # ChibiOS >= 20.x | 262 | include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk |
| 263 | # RTOS files (optional). | 263 | # RTOS files (optional). |
| 264 | include $(CHIBIOS)/os/rt/rt.mk | 264 | include $(CHIBIOS)/os/rt/rt.mk |
| 265 | # Other files (optional). | 265 | # Other files (optional). |
| @@ -270,6 +270,7 @@ PLATFORM_SRC = \ | |||
| 270 | $(KERNSRC) \ | 270 | $(KERNSRC) \ |
| 271 | $(PORTSRC) \ | 271 | $(PORTSRC) \ |
| 272 | $(OSALSRC) \ | 272 | $(OSALSRC) \ |
| 273 | $(OSLIBSRC) \ | ||
| 273 | $(HALSRC) \ | 274 | $(HALSRC) \ |
| 274 | $(PLATFORMSRC) \ | 275 | $(PLATFORMSRC) \ |
| 275 | $(BOARDSRC) \ | 276 | $(BOARDSRC) \ |
| @@ -285,11 +286,11 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM) | |||
| 285 | 286 | ||
| 286 | PLATFORM_SRC := $(patsubst $(TOP_DIR)/%,%,$(PLATFORM_SRC)) | 287 | PLATFORM_SRC := $(patsubst $(TOP_DIR)/%,%,$(PLATFORM_SRC)) |
| 287 | 288 | ||
| 288 | EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \ | 289 | EXTRAINCDIRS += $(CHIBIOS)/os/license \ |
| 289 | $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \ | 290 | $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \ |
| 290 | $(TOP_DIR)/platforms/chibios/boards/common/configs \ | 291 | $(TOP_DIR)/platforms/chibios/boards/common/configs \ |
| 291 | $(HALCONFDIR) $(CHCONFDIR) \ | 292 | $(HALCONFDIR) $(CHCONFDIR) \ |
| 292 | $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ | 293 | $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) $(OSLIBINC) \ |
| 293 | $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ | 294 | $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ |
| 294 | $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH) | 295 | $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH) |
| 295 | 296 | ||
