From 4f8cdceddf77fe41793f6dd8b7218474ea14afc7 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sun, 9 Jun 2019 18:07:30 +0200
Subject: [PATCH] feat(hello-freertos): Switch to upstream v10.2.1
Signed-off-by: Rahix <rahix@rahix.de>
---
hw-tests/hello-freertos/meson.build | 10 ++++++----
lib/meson.build | 3 +++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw-tests/hello-freertos/meson.build b/hw-tests/hello-freertos/meson.build
index 457a67681..c24b57865 100644
--- a/hw-tests/hello-freertos/meson.build
+++ b/hw-tests/hello-freertos/meson.build
@@ -1,11 +1,13 @@
name = 'hello-freertos'
freertos = static_library(
- 'freertos-sdk',
- freertos_sdk_sources,
+ 'freertos',
+ freertos_sources,
+ freertos_cli_sources,
dependencies: periphdriver,
include_directories: [
- freertos_sdk_includes,
+ freertos_includes,
+ freertos_cli_includes,
include_directories('./'),
]
)
@@ -19,7 +21,7 @@ sources = files(
elf = executable(
name + '.elf',
sources,
- include_directories: freertos_sdk_includes,
+ include_directories: [freertos_includes, freertos_cli_includes],
dependencies: [libcard10, max32665_startup],
link_with: freertos,
link_whole: [max32665_startup_lib, board_card10_lib],
diff --git a/lib/meson.build b/lib/meson.build
index 80fd654a8..678cd5765 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -6,5 +6,8 @@ subdir('./vendor/Bosch/BMA400/')
subdir('./vendor/Maxim/MAX77650/')
subdir('./gfx/')
+subdir('./FreeRTOS/')
+subdir('./FreeRTOS-Plus/')
+
subdir('./card10/')
subdir('./ff13/')
--
GitLab