Can boot OS v0.1.0. (#9)

* Can boot OS v0.1.0.
* Clean up workflows

Author: jonathanpallant

.github/workflows/build.yml

@@ -0,0 +1,62 @@
+name: Build
+
+on: [push, pull_request]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
+    strategy:
+      matrix:
+        # All code should be running on stable now
+        rust: [nightly, stable]
+        include:
+          # Nightly is only for reference and allowed to fail
+          - rust: nightly
+            experimental: true
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          target: thumbv6m-none-eabi
+
+      - name: Build Code
+        run: cargo build --release --verbose
+
+      - name: Get Branch Name
+        if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
+        id: branch_name
+        run: |
+          echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
+
+      - name: Create Release
+        if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ steps.branch_name.outputs.SOURCE_TAG }}
+          draft: false
+          prerelease: false
+
+      - name: Upload files to Release
+        if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            target/thumbv6m-none-eabi/release/neotron-pico
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/clippy.yml

@@ -0,0 +1,26 @@
+name: Clippy
+
+on: [push, pull_request]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  clippy-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          components: clippy
+          target: thumbv6m-none-eabi
+
+      - name: Run Clippy
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features --target=thumbv6m-none-eabi

.github/workflows/format.yml

@@ -3,13 +3,17 @@ name: Format
 on: [push, pull_request]
 
 jobs:
-  check:
-
+  format-check:
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v1
-    - name: Add Tool
-      run: rustup component add rustfmt
-    - name: Check Format
-      run: cargo fmt -- --check
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          components: rustfmt
+
+      - name: Check Format
+        run: cargo fmt -- --check

.github/workflows/release.yml

@@ -14,8 +14,8 @@ cortex-m = "0.7"
 rp-pico = "0.3"
 # Cortex-M run-time (or start-up) code
 cortex-m-rt = "0.7"
-# The BIOS API we export to the OS
-neotron-common-bios = { git = "https://github.com/Neotron-Compute/Neotron-Common-BIOS.git" }
+# The BIOS to OS API
+neotron-common-bios = "0.1.0"
 # For time keeping/handling
 embedded-time = "0.12"
 # For the RP2040 bootloader
@@ -28,8 +28,6 @@ defmt = "0.3"
 defmt-rtt = "0.3"
 # Send panics to the debugger
 panic-probe = "0.2"
-# Fetches git hashes from git at compile time
-git-version = "0.3"
 # RP2040 PIO assembler
 pio = "0.2"
 # Macros for RP2040 PIO assembler

.github/workflows/rust.yml

@@ -55,7 +55,16 @@ user@host ~ $ cargo install probe-rs
 
 4. Power on your Neotron Pico.
 
-5. Build and load the Neotron BIOS, and view the debug output stream, with `cargo run --release`:
+5. Build the Neotron OS
+
+We use the "neotron-os-pico.ld" linker script to link it at `0x1002_0000`.
+
+```console
+user@host ~/neotron-os $ cargo build --release
+user@host ~/neotron-os $ arm-none-eabi-objcopy -O binary ./target/thumbv6m-none-eabi/release/flash1002 ../neotron-pico-bios/src/flash1002.bin
+```
+
+6. Build and load the Neotron BIOS, and view the debug output stream, with `cargo run --release`:
 
 ```console
 user@host ~/neotron-pico-bios $ DEFMT_LOG=debug cargo run --release

Cargo.toml

@@ -28,4 +28,22 @@ fn main() {
 	// here, we ensure the build script is only re-run when
 	// `memory.x` is changed.
 	println!("cargo:rerun-if-changed=memory.x");
+
+	// Get git version
+	if let Ok(cmd_output) = std::process::Command::new("git")
+		.arg("describe")
+		.arg("--all")
+		.arg("--dirty")
+		.arg("--long")
+		.output()
+	{
+		let git_version = std::str::from_utf8(&cmd_output.stdout).unwrap();
+		println!(
+			"cargo:rustc-env=BIOS_VERSION={} (git:{})",
+			env!("CARGO_PKG_VERSION"),
+			git_version.trim()
+		);
+	} else {
+		println!("cargo:rustc-env=BIOS_VERSION={}", env!("CARGO_PKG_VERSION"));
+	}
 }

README.md

@@ -68,4 +68,12 @@ SECTIONS {
     {
         KEEP(*(.boot2));
     } > BOOT2
+
+    /* ### Neotron OS */
+    .flash_os ORIGIN(FLASH_OS) :
+    {
+        KEEP(*(.flash_os));
+    } > FLASH_OS
 } INSERT BEFORE .text;
+
+