Zephyr manifest

.github/actions/deps/ports/zephyr-cp/action.yml

@@ -6,4 +6,5 @@ runs:
     - name: Setup Zephyr project
       uses: zephyrproject-rtos/action-zephyr-setup@v1
       with:
+        app-path: ports/zephyr-cp/zephyr-config
         toolchains: arm-zephyr-eabi

.gitmodules

@@ -410,7 +410,3 @@
 [submodule "ports/analog/msdk"]
 	path = ports/analog/msdk
 	url = https://github.com/analogdevicesinc/msdk.git
-[submodule "lib/zephyr"]
-	path = ports/zephyr-cp/lib/zephyr
-	url = https://github.com/adafruit/zephyr.git
-	branch = circuitpython

ports/zephyr-cp/.gitignore

@@ -3,3 +3,5 @@ bootloader
 build
 modules
 tools
+zephyr
+.west

ports/zephyr-cp/cptools/build_circuitpython.py

@@ -32,7 +32,7 @@
 # Path to where CMake puts Zephyr's build output.
 zephyrbuilddir = builddir / ".." / ".." / ".." / "zephyr"
 
-sys.path.append(str(portdir / "lib/zephyr/scripts/dts/python-devicetree/src/"))
+sys.path.append(str(portdir / "zephyr/scripts/dts/python-devicetree/src/"))
 from devicetree import dtlib
 
 compiler = cpbuild.Compiler(srcdir, builddir, cmake_args)

ports/zephyr-cp/supervisor/port.c

@@ -13,7 +13,7 @@
 #include <zephyr/sys/reboot.h>
 
 #include "lib/tlsf/tlsf.h"
-#include "ports/zephyr-cp/lib/zephyr/include/zephyr/device.h"
+#include <zephyr/device.h>
 
 static tlsf_t heap;
 

ports/zephyr-cp/zephyr-config/west.yml

@@ -0,0 +1,7 @@
+manifest:
+  projects:
+    - name: zephyr
+      url: https://github.com/adafruit/zephyr
+      revision: circuitpython
+      clone-depth: 100
+      import: true