From 46cd5d16bb1045ea574e43a845488bc9d604d8be Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Mon, 10 Mar 2025 15:59:06 -0600
Subject: [PATCH] Move modeltool from scripts/ to tools/

Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 scripts/readmes.sh                       | 4 ++--
 tools/README.md                          | 2 ++
 {scripts => tools}/modeltool/.gitignore  | 0
 {scripts => tools}/modeltool/Cargo.lock  | 6 +++---
 {scripts => tools}/modeltool/Cargo.toml  | 0
 {scripts => tools}/modeltool/src/main.rs | 0
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename {scripts => tools}/modeltool/.gitignore (100%)
 rename {scripts => tools}/modeltool/Cargo.lock (91%)
 rename {scripts => tools}/modeltool/Cargo.toml (100%)
 rename {scripts => tools}/modeltool/src/main.rs (100%)

diff --git a/scripts/readmes.sh b/scripts/readmes.sh
index 29686a5..44249ae 100755
--- a/scripts/readmes.sh
+++ b/scripts/readmes.sh
@@ -8,9 +8,9 @@ README_DIRS=(
 
 set -e
 
-cargo build --manifest-path "scripts/modeltool/Cargo.toml" --release
+cargo build --manifest-path "tools/modeltool/Cargo.toml" --release
 
-MODELTOOL="$(realpath "scripts/modeltool/target/release/modeltool")"
+MODELTOOL="$(realpath "tools/modeltool/target/release/modeltool")"
 
 readme_model() {
     echo -e "\x1B[1m$1\x1B[0m" >&2
diff --git a/tools/README.md b/tools/README.md
index 7b4983d..3998530 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -4,6 +4,8 @@
 
 - [apobtool](https://github.com/system76/apobtool.git)
 - [coreboot-collector](https://github.com/system76/coreboot-collector.git) - coreboot-collector
+- [intel-spi](https://github.com/system76/intel-spi.git) - intel-spi
 - [ipxe](https://github.com/ipxe/ipxe.git)
 - [MEAnalyzer](https://github.com/platomav/MEAnalyzer.git) - ME Analyzer
+- [modeltool](./modeltool)
 - [UEFITool](https://github.com/LongSoft/UEFITool.git) - UEFITool
diff --git a/scripts/modeltool/.gitignore b/tools/modeltool/.gitignore
similarity index 100%
rename from scripts/modeltool/.gitignore
rename to tools/modeltool/.gitignore
diff --git a/scripts/modeltool/Cargo.lock b/tools/modeltool/Cargo.lock
similarity index 91%
rename from scripts/modeltool/Cargo.lock
rename to tools/modeltool/Cargo.lock
index 4f0ff3f..9e6e429 100644
--- a/scripts/modeltool/Cargo.lock
+++ b/tools/modeltool/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "bitflags"
@@ -35,9 +35,9 @@ dependencies = [
 
 [[package]]
 name = "redox_uefi"
-version = "0.1.9"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b62fcb91f21639dc1f36e478fa7bb6cea939282f5c7d0f9190c62ee7b8d286"
+checksum = "c5d69301333534a04b380995f5d9e604f46a7cbd8d8c62c996ee27447efdeba4"
 
 [[package]]
 name = "system76_ecflash"
diff --git a/scripts/modeltool/Cargo.toml b/tools/modeltool/Cargo.toml
similarity index 100%
rename from scripts/modeltool/Cargo.toml
rename to tools/modeltool/Cargo.toml
diff --git a/scripts/modeltool/src/main.rs b/tools/modeltool/src/main.rs
similarity index 100%
rename from scripts/modeltool/src/main.rs
rename to tools/modeltool/src/main.rs