No longer requires cmake or ninja.

Untested on hardware.

.github/workflows/build-ferrocene.yml

@@ -5,26 +5,6 @@ name: workflow-build-everything-ferrocene
 run-name: Build Everything with Ferrocene
 on: [push]
 jobs:
-  job-build-threadx-staticlib:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
-      - name: Install tools
-        run: |
-          sudo apt-get update -y && sudo apt-get -y install cmake gcc gcc-arm-none-eabi build-essential ninja-build
-      - name: Compile ThreadX for Cortex-M4
-        run: |
-          cd threadx
-          cmake -Bbuild_m4 -GNinja -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake
-          cmake --build ./build_m4
-      - name: Upload staticlib
-        uses: actions/upload-artifact@master
-        with:
-          name: threadx-cm4
-          path: threadx/build_m4/libthreadx.a
   job-build-demo-app:
     runs-on: ubuntu-latest
     needs: job-build-threadx-staticlib
@@ -37,13 +17,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - name: Download staticlib
-        uses: actions/download-artifact@master
-        with:
-          name: threadx-cm4
-          path: threadx/build # Where build.rs expects it
       - name: Install Ferrocene
-        env: # Or as an environment variable
+        env:
           CRITICALUP_TOKEN: ${{ secrets.CRITICALUP_TOKEN }}
         run: |
           criticalup install

.github/workflows/build.yml

@@ -5,26 +5,6 @@ name: workflow-build-everything
 run-name: Build Everything
 on: [push]
 jobs:
-  job-build-threadx-staticlib:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
-      - name: Install tools
-        run: |
-          sudo apt-get update -y && sudo apt-get -y install cmake gcc gcc-arm-none-eabi build-essential ninja-build
-      - name: Compile ThreadX for Cortex-M4
-        run: |
-          cd threadx
-          cmake -Bbuild_m4 -GNinja -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake
-          cmake --build ./build_m4
-      - name: Upload staticlib
-        uses: actions/upload-artifact@master
-        with:
-          name: threadx-cm4
-          path: threadx/build_m4/libthreadx.a
   job-build-demo-app:
     runs-on: ubuntu-latest
     needs: job-build-threadx-staticlib
@@ -40,11 +20,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - name: Download staticlib
-        uses: actions/download-artifact@master
-        with:
-          name: threadx-cm4
-          path: threadx/build # Where build.rs expects it
       - name: Add rustup target
         run: |
           rustup target add thumbv7em-none-eabi

build.sh

@@ -1,18 +1,12 @@
 #!/bin/bash
 
-# Builds the Cortex-M4 version of ThreadX, then builds a Rust
-# application that links to it.
+# Builds the various ThreadX demo apps.
 
-# SPDX-FileCopyrightText: Copyright (c) 2023 Ferrous Systems
+# SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems
 # SPDX-License-Identifier: MIT OR Apache-2.0
 
 set -euo pipefail
 
-pushd threadx
-cmake -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake .
-cmake --build ./build
-popd
-
 pushd demo-app
 cargo build --release
 popd