From a455f3899df890113fed6958ec98538558ca4fc1 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Thu, 21 Mar 2024 09:56:12 +0100 Subject: [PATCH 1/4] Select kernel clock or counter clock with a Kconfig option --- core/src/main/resources/lib/c/reactor-c | 2 +- core/src/main/resources/lib/platform/zephyr/Kconfig | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index 7427d987d7..aa12f14834 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 7427d987d725111141139819c5341921edd0fef1 +Subproject commit aa12f1483474a777dd1a8aa48057fc3b742bb1ff diff --git a/core/src/main/resources/lib/platform/zephyr/Kconfig b/core/src/main/resources/lib/platform/zephyr/Kconfig index 5ba198ca54..e77084f7f6 100644 --- a/core/src/main/resources/lib/platform/zephyr/Kconfig +++ b/core/src/main/resources/lib/platform/zephyr/Kconfig @@ -1 +1,5 @@ source "Kconfig.zephyr" + +config LF_ZEPHYR_CLOCK_COUNTER + bool "LF uses the counter API for timing services. Only supported for some boards." + default n From c5ae05afc16b1b2f06f2f254f1d132b953f627b8 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Fri, 22 Mar 2024 23:05:54 +0100 Subject: [PATCH 2/4] Make Zephyr kernel clock the default. --- core/src/main/resources/lib/c/reactor-c | 2 +- core/src/main/resources/lib/platform/zephyr/prj_lf.conf | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index aa12f14834..189b95376a 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit aa12f1483474a777dd1a8aa48057fc3b742bb1ff +Subproject commit 189b95376aa194c46d367137ca53b3ea5671fd6b diff --git a/core/src/main/resources/lib/platform/zephyr/prj_lf.conf b/core/src/main/resources/lib/platform/zephyr/prj_lf.conf index 6b171daff2..5b026c5035 100644 --- a/core/src/main/resources/lib/platform/zephyr/prj_lf.conf +++ b/core/src/main/resources/lib/platform/zephyr/prj_lf.conf @@ -1,15 +1,9 @@ # Lingua Franca Zephyr configuration file - # This is a generated file, do not edit. -# To supply additional configuration parameters add an additional -# configuration file to the build with -# west build -b qemu_cortex_m3 -- -DOVERLAY_CONFIG=my_conf.prj # Enable printf CONFIG_PRINTK=y # Use the newlib C library CONFIG_NEWLIB_LIBC=y CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y -# Enable the counter API used for hi-res clock -CONFIG_COUNTER=y CONFIG_THREAD_CUSTOM_DATA=y From d996b8cd304f1ed6940855e343f1209054ee5c53 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Sat, 23 Mar 2024 09:01:54 +0100 Subject: [PATCH 3/4] Bump reactor-c --- core/src/main/resources/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index 189b95376a..4df720a7d4 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 189b95376aa194c46d367137ca53b3ea5671fd6b +Subproject commit 4df720a7d4aad89c09d9cbb5219636b8d65b3833 From bb445c0b94be110022b1fa7a98a054de60978906 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Fri, 12 Apr 2024 09:48:12 +0200 Subject: [PATCH 4/4] Remove outdated changes in Kconfig --- core/src/main/resources/lib/platform/zephyr/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/src/main/resources/lib/platform/zephyr/Kconfig b/core/src/main/resources/lib/platform/zephyr/Kconfig index e77084f7f6..5ba198ca54 100644 --- a/core/src/main/resources/lib/platform/zephyr/Kconfig +++ b/core/src/main/resources/lib/platform/zephyr/Kconfig @@ -1,5 +1 @@ source "Kconfig.zephyr" - -config LF_ZEPHYR_CLOCK_COUNTER - bool "LF uses the counter API for timing services. Only supported for some boards." - default n