Upgrade to Zephyr v3.4

LibreSolar · Jun 22, 2023 · 7599b7b · 7599b7b
1 parent af6784c
commit 7599b7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/prj.conf b/app/prj.conf
@@ -3,8 +3,8 @@
 # only very small heap necessary for malloc in printf statements with %f
 CONFIG_HEAP_MEM_POOL_SIZE=256
 
-CONFIG_CPLUSPLUS=y
-CONFIG_LIB_CPLUSPLUS=y
+CONFIG_CPP=y
+CONFIG_REQUIRES_FULL_LIBCPP=y
 
 CONFIG_NEWLIB_LIBC=y
 CONFIG_NEWLIB_LIBC_NANO=y

diff --git a/tests/prj.conf b/tests/prj.conf
@@ -3,8 +3,8 @@
 # only very small heap necessary for malloc in printf statements with %f
 CONFIG_HEAP_MEM_POOL_SIZE=256
 
-CONFIG_CPLUSPLUS=y
-CONFIG_LIB_CPLUSPLUS=y
+CONFIG_CPP=y
+CONFIG_REQUIRES_FULL_LIBCPP=y
 
 #CONFIG_WATCHDOG=y
 #CONFIG_WDT_DISABLE_AT_BOOT=y

diff --git a/west.yml b/west.yml
@@ -10,8 +10,8 @@ manifest:
       url-base: https://github.com/ThrowTheSwitch
   projects:
     - name: zephyr
-      remote: libresolar
-      revision: v3.2-branch
+      remote: zephyrproject
+      revision: v3.4-branch
       import:
         name-allowlist:
           - cmsis