Prune zephyr manifest (#30)

* Vibe Coded West Manifest

* Vibe Coded West Manifest

* Trying to Fix CI

* Bump to Test CI

* Improving CI with Caching

* Trying to fix cache

* Verification Patch

* Introduce build-lite

* Added generate-lite

* Moving Submodules

* Removing Things We Don't Need

* Attempting to Cache Submodules

* Attempting to Cache Submodules

* Initing the Modules

* Trying Some Git Commit Stuff

* Attempting Direct Clone

* Reduce

* Use make submodules

* working

* Fix order

---------

Co-authored-by: Nate Gay <[email protected]>

Author: Mikefly123

.github/workflows/ci.yaml

@@ -14,17 +14,81 @@ jobs:
       - name: Lint
         run: |
           make fmt
+
   build:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - name: Build
-        run: |
-          make build
-      - name: Archive
-        uses: actions/upload-artifact@v4
-        with:
-          name: artifacts
-          path: |
-            build-artifacts/zephyr.uf2
-            build-artifacts/zephyr/fprime-zephyr-deployment/dict/ReferenceDeploymentTopologyDictionary.json
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        submodules: false  # We'll handle submodules with smart caching
+        fetch-depth: 0
+
+    - name: Cache submodules
+      id: cache-submodules
+      uses: actions/cache@v4
+      with:
+        path: |
+          lib/fprime
+          lib/fprime-zephyr
+          lib/zephyr-workspace/zephyr
+        key: project-deps-${{ hashFiles('.gitmodules') }}-v3
+        restore-keys: |
+          project-deps-${{ hashFiles('.gitmodules') }}-
+          project-deps-
+
+    - name: Setup submodules
+      if: steps.cache-submodules.outputs.cache-hit != 'true'
+      run: |
+        make submodules
+
+    - name: Cache python environment
+      id: cache-python
+      uses: actions/cache@v4
+      with:
+        path: fprime-venv
+        key: python-packages-${{ runner.os }}-${{ hashFiles('requirements.txt') }}-v3
+        restore-keys: |
+          python-packages-${{ runner.os }}-
+          python-packages-
+
+    - name: Setup python environment
+      if: steps.cache-python.outputs.cache-hit != 'true'
+      run: |
+        make fprime-venv
+
+    - name: Cache Zephyr workspace and SDK
+      id: cache-zephyr
+      uses: actions/cache@v4
+      with:
+        path: |
+          lib/zephyr-workspace/modules
+          lib/zephyr-workspace/bootloader
+          ~/zephyr-sdk-0.17.2
+        key: zephyr-minimal-${{ hashFiles('west.yml') }}-${{ runner.os }}-v3
+        restore-keys: |
+          zephyr-minimal-${{ hashFiles('west.yml') }}-${{ runner.os }}-
+          zephyr-minimal-
+
+    - name: Setup Zephyr
+      if: steps.cache-zephyr.outputs.cache-hit != 'true'
+      run: |
+        make zephyr-setup
+      env:
+        PIP_DISABLE_PIP_VERSION_CHECK: 1
+        PIP_NO_COMPILE: 1
+
+    - name: Build
+      run: |
+        # Skip both zephyr-setup and submodules since we cached them separately
+        make build -o zephyr-setup -o submodules
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: artifacts
+        path: |
+          build-artifacts/zephyr.uf2
+          build-artifacts/zephyr/fprime-zephyr-deployment/dict/ReferenceDeploymentTopologyDictionary.json
+        retention-days: 30

CMakeLists.txt

@@ -4,6 +4,11 @@
 ####
 
 cmake_minimum_required(VERSION 3.24.2)
+
+# Set BOARD_ROOT to find custom boards
+# The structure is BOARD_ROOT/boards/vendor/board
+list(APPEND BOARD_ROOT "${CMAKE_CURRENT_LIST_DIR}")
+
 # Patch in std-atomic implementations
 if (BOARD STREQUAL "rpi_pico" OR FPRIME_ZEPHYR_USE_STD_ATOMIC_FIX)
     include_directories(BEFORE "${CMAKE_CURRENT_LIST_DIR}/lib/fprime-zephyr/fprime-zephyr/Os/StdAtomic")

Makefile

@@ -21,13 +21,14 @@ fprime-venv: ## Create a virtual environment
 
 .PHONY: zephyr-setup
 zephyr-setup: fprime-venv ## Set up Zephyr environment
-	@test -s lib/zephyr-workspace/tools/edtt/.gitignore || { \
+	@test -d lib/zephyr-workspace/modules/hal/rpi_pico || test -d ../lib/zephyr-workspace/modules/hal/rpi_pico || { \
 		echo "Setting up Zephyr environment..."; \
-		cd lib/zephyr-workspace && \
-			$(UVX) west update && \
-			$(UVX) west zephyr-export && \
-			$(UV) run west packages pip --install && \
-			$(UV) run west sdk install; \
+		rm -rf ../.west/ && \
+		$(UVX) west init --local . && \
+		$(UVX) west update && \
+		$(UVX) west zephyr-export && \
+		$(UV) run west packages pip --install && \
+		$(UV) run west sdk install --toolchains arm-zephyr-eabi; \
 	}
 
 ##@ Development
@@ -67,6 +68,12 @@ clean: ## Remove all gitignored files
 clean-zephyr: ## Remove all Zephyr build files
 	rm -rf lib/zephyr-workspace/bootloader lib/zephyr-workspace/modules lib/zephyr-workspace/tools
 
+.PHONY: clean-zephyr-sdk
+clean-zephyr-sdk: ## Remove Zephyr SDK (reinstall with 'make zephyr-setup')
+	@echo "Removing Zephyr SDK..."
+	rm -rf ~/zephyr-sdk-*
+	@echo "Run 'make zephyr-setup' to reinstall with minimal ARM-only toolchain"
+
 ##@ Operations
 
 .PHONY: gds

lib/zephyr-workspace/.west/config

@@ -0,0 +1,88 @@
+# West manifest for PROVES Core - Optimized for RP2040/RP2350 only
+# This minimal manifest significantly reduces the download and setup time
+# by only including modules required for Raspberry Pi RP2040/RP2350 builds
+
+manifest:
+  defaults:
+    remote: upstream
+
+  remotes:
+    - name: upstream
+      url-base: https://github.com/zephyrproject-rtos
+
+  # Import filter to exclude optional groups
+  group-filter: [-babblesim, -optional]
+
+  projects:
+    # Zephyr RTOS core
+    - name: zephyr
+      repo-path: zephyr
+      revision: v4.2.0
+      path: lib/zephyr-workspace/zephyr
+      west-commands: scripts/west-commands.yml
+      import:
+        # Import specific submanifests only (instead of all submanifests)
+        name-allowlist:
+          - cmsis      # ARM CMSIS support (required for Cortex-M)
+          - hal_rpi_pico  # Raspberry Pi Pico HAL (REQUIRED for RP2040/RP2350)
+          - picolibc   # C library
+          - mbedtls    # Crypto library
+          - tinycrypt  # Lightweight crypto library
+          - mcuboot    # Bootloader support
+
+    # Core modules required for RP2040/RP2350
+    - name: cmsis
+      revision: 512cc7e895e8491696b61f7ba8066b4a182569b8
+      path: lib/zephyr-workspace/modules/hal/cmsis
+      groups:
+        - hal
+
+    - name: cmsis_6
+      repo-path: CMSIS_6
+      revision: 06d952b6713a2ca41c9224a62075e4059402a151
+      path: lib/zephyr-workspace/modules/hal/cmsis_6
+      groups:
+        - hal
+
+    - name: hal_rpi_pico
+      path: lib/zephyr-workspace/modules/hal/rpi_pico
+      revision: 7b57b24588797e6e7bf18b6bda168e6b96374264
+      groups:
+        - hal
+
+    - name: hal_st
+      revision: 9f81b4427e955885398805b7bca0da3a8cd9109c
+      path: lib/zephyr-workspace/modules/hal/st
+      groups:
+        - hal
+
+    - name: picolibc
+      path: lib/zephyr-workspace/modules/lib/picolibc
+      revision: 560946f26db075c296beea5b39d99e6de43c9010
+
+    - name: loramac-node
+      revision: fb00b383072518c918e2258b0916c996f2d4eebe
+      path: lib/zephyr-workspace/modules/lib/loramac-node
+
+    # Crypto libraries (commonly used)
+    - name: mbedtls
+      revision: 85440ef5fffa95d0e9971e9163719189cf34d979
+      path: lib/zephyr-workspace/modules/crypto/mbedtls
+      groups:
+        - crypto
+
+    - name: tinycrypt
+      revision: 1012a3ebee18c15ede5efc8332ee2fc37817670f
+      path: lib/zephyr-workspace/modules/crypto/tinycrypt
+      groups:
+        - crypto
+
+    # Bootloader support (optional - remove if not needed)
+    - name: mcuboot
+      revision: 4eba8087fa606db801455f14d185255bc8c49467
+      path: lib/zephyr-workspace/bootloader/mcuboot
+      groups:
+        - bootloader
+
+  self:
+    path: .