Add SPI and merge zephyr_(serial|i2c) into busio

.github/workflows/run-tests.yml

@@ -23,36 +23,36 @@ jobs:
       TEST_native: --emit native
       TEST_native_mpy: --via-mpy --emit native -d basics float micropython
     steps:
-    - name: Set up repository
-      uses: actions/checkout@v4
-      with:
-        submodules: false
-        show-progress: false
-        fetch-depth: 1
-    - name: Set up python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.12
-    - name: Set up submodules
-      uses: ./.github/actions/deps/submodules
-      with:
-        target: tests
-    - name: Set up external
-      if: matrix.test == 'all'
-      uses: ./.github/actions/deps/external
-    - name: Set up mpy-cross
-      uses: ./.github/actions/mpy_cross
-      with:
-        cp-version: ${{ inputs.cp-version }}
-    - name: Build unix port
-      run: make -C ports/unix VARIANT=coverage -j4
-    - name: Run tests
-      run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
-      working-directory: tests
-    - name: Print failure info
-      run: ./run-tests.py -j4 --print-failures
-      if: failure()
-      working-directory: tests
+      - name: Set up repository
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+          show-progress: false
+          fetch-depth: 1
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Set up submodules
+        uses: ./.github/actions/deps/submodules
+        with:
+          target: tests
+      - name: Set up external
+        if: matrix.test == 'all'
+        uses: ./.github/actions/deps/external
+      - name: Set up mpy-cross
+        uses: ./.github/actions/mpy_cross
+        with:
+          cp-version: ${{ inputs.cp-version }}
+      - name: Build unix port
+        run: make -C ports/unix VARIANT=coverage -j4
+      - name: Run tests
+        run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
+        working-directory: tests
+      - name: Print failure info
+        run: ./run-tests.py -j4 --print-failures
+        if: failure()
+        working-directory: tests
     # Not working after MicroPython v1.23 merge.
     # - name: Build native modules
     #   if: matrix.test == 'all'
@@ -66,3 +66,27 @@ jobs:
     #   if: matrix.test == 'all'
     #   run: ./run-natmodtests.py extmod/{heapq*,random*,re*}.py
     #   working-directory: tests
+
+  zephyr:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+    env:
+      CP_VERSION: ${{ inputs.cp-version }}
+    steps:
+      - name: Set up repository
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+          show-progress: false
+          fetch-depth: 1
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.13
+      - name: Set up Zephyr
+        uses: ./.github/actions/deps/ports/zephyr-cp
+      - name: Set up external
+        uses: ./.github/actions/deps/external
+      - name: Run Zephyr build tests
+        run: make -C ports/zephyr-cp test

locale/circuitpython.pot

@@ -1117,9 +1117,8 @@ msgid ""
 "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
 msgstr ""
 
-#: ports/zephyr-cp/bindings/zephyr_i2c/I2C.c shared-bindings/bitbangio/I2C.c
-#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
-#: shared-bindings/busio/SPI.c
+#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
+#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
 msgid "Function requires lock"
 msgstr ""
 
@@ -1462,8 +1461,7 @@ msgstr ""
 msgid "Mount point directory missing"
 msgstr ""
 
-#: ports/zephyr-cp/bindings/zephyr_serial/UART.c shared-bindings/busio/UART.c
-#: shared-bindings/displayio/Group.c
+#: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c
 msgid "Must be a %q subclass."
 msgstr ""
 
@@ -2396,6 +2394,12 @@ msgstr ""
 msgid "Update failed"
 msgstr ""
 
+#: ports/zephyr-cp/common-hal/busio/I2C.c
+#: ports/zephyr-cp/common-hal/busio/SPI.c
+#: ports/zephyr-cp/common-hal/busio/UART.c
+msgid "Use device tree to define %q devices"
+msgstr ""
+
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 #: ports/nordic/common-hal/_bleio/Characteristic.c
 #: ports/nordic/common-hal/_bleio/Descriptor.c

ports/zephyr-cp/Makefile

@@ -8,7 +8,7 @@ BUILD ?= build-$(BOARD)
 
 TRANSLATION ?= en_US
 
-.PHONY: $(BUILD)/zephyr-cp/zephyr/zephyr.elf flash debug clean menuconfig
+.PHONY: $(BUILD)/zephyr-cp/zephyr/zephyr.elf flash debug clean menuconfig all clean-all test
 
 $(BUILD)/zephyr-cp/zephyr/zephyr.elf:
 	python cptools/pre_zephyr_build_prep.py $(BOARD)
@@ -31,3 +31,14 @@ menuconfig:
 
 clean:
 	rm -rf $(BUILD)
+
+# Build all boards. The + prefix allows jobserver file descriptors to be passed through.
+# This enables parallel builds across all boards when invoked with `make -jN all`.
+all:
+	+python cptools/build_all_boards.py --continue-on-error
+
+clean-all:
+	rm -rf build build-*
+
+test:
+	pytest cptools/tests