system76 · jackpot51 · Sep 8, 2025 · Aug 26, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
         run: ./scripts/deps.sh
 
       - name: Build tool
-        run: cargo build ${{ matrix.features }} --release --manifest-path tool/Cargo.toml
+        run: cargo build ${{ matrix.features }} --release --manifest-path tools/system76_ectool/Cargo.toml
 
   ec:
     runs-on: ubuntu-24.04

diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "ecsim"]
-	path = ecsim
+	path = tools/ecsim
 	url = https://github.com/system76/ecsim.git
 	branch = master
 [submodule "ecflash"]
-	path = ecflash
+	path = tools/ecflash
 	url = https://github.com/system76/ecflash.git
 	branch = master
 [submodule "ecspy"]
-	path = ecspy
+	path = tools/ecspy
 	url = https://github.com/system76/ecspy.git
diff --git a/scripts/ectool.sh b/scripts/ectool.sh
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 set -e
-cargo build --release --quiet --manifest-path tool/Cargo.toml
-sudo tool/target/release/system76_ectool "$@"
+cargo build --release --quiet --manifest-path tools/system76_ectool/Cargo.toml
+sudo tools/system76_ectool/target/release/system76_ectool "$@"
diff --git a/src/arch/8051/toolchain.mk b/src/arch/8051/toolchain.mk
@@ -28,7 +28,7 @@ OBJ = $(MAIN_OBJ) $(sort $(ASM_OBJ) $(C_OBJ))
 sim: $(BUILD)/ec.rom
 	cargo run \
 		--release \
-		--manifest-path ecsim/Cargo.toml \
+		--manifest-path tools/ecsim/Cargo.toml \
 		--no-default-features \
 		-- $<
 

diff --git a/src/board/system76/common/common.mk b/src/board/system76/common/common.mk
@@ -134,5 +134,5 @@ flash_internal: $(BUILD)/ec.rom
 	sudo tool/target/release/system76_ectool flash $<
 
 flash_external: $(BUILD)/ec.rom
-	cargo build --manifest-path ecflash/Cargo.toml --example isp --release
-	sudo ecflash/target/release/examples/isp $<
+	cargo build --manifest-path tools/ecflash/Cargo.toml --example isp --release
+	sudo tools/ecflash/target/release/examples/isp $<
diff --git a/containers/Makefile → tools/containers/Makefile b/containers/Makefile → tools/containers/Makefile
diff --git a/containers/ec/Containerfile → tools/containers/ec/Containerfile b/containers/ec/Containerfile → tools/containers/ec/Containerfile
diff --git a/ecflash → tools/ecflash b/ecflash → tools/ecflash
diff --git a/ecsim → tools/ecsim b/ecsim → tools/ecsim
diff --git a/ecspy → tools/ecspy b/ecspy → tools/ecspy
diff --git a/tool/.gitignore → tools/system76_ectool/.gitignore b/tool/.gitignore → tools/system76_ectool/.gitignore
diff --git a/tool/Cargo.lock → tools/system76_ectool/Cargo.lock b/tool/Cargo.lock → tools/system76_ectool/Cargo.lock
diff --git a/tool/Cargo.toml → tools/system76_ectool/Cargo.toml b/tool/Cargo.toml → tools/system76_ectool/Cargo.toml
diff --git a/tool/LICENSE → tools/system76_ectool/LICENSE b/tool/LICENSE → tools/system76_ectool/LICENSE
diff --git a/tool/src/access/hid.rs → tools/system76_ectool/src/access/hid.rs b/tool/src/access/hid.rs → tools/system76_ectool/src/access/hid.rs
diff --git a/tool/src/access/lpc/direct.rs → .../system76_ectool/src/access/lpc/direct.rs b/tool/src/access/lpc/direct.rs → .../system76_ectool/src/access/lpc/direct.rs
diff --git a/tool/src/access/lpc/linux.rs → ...s/system76_ectool/src/access/lpc/linux.rs b/tool/src/access/lpc/linux.rs → ...s/system76_ectool/src/access/lpc/linux.rs
diff --git a/tool/src/access/lpc/mod.rs → tools/system76_ectool/src/access/lpc/mod.rs b/tool/src/access/lpc/mod.rs → tools/system76_ectool/src/access/lpc/mod.rs
diff --git a/tool/src/access/lpc/sim.rs → tools/system76_ectool/src/access/lpc/sim.rs b/tool/src/access/lpc/sim.rs → tools/system76_ectool/src/access/lpc/sim.rs
diff --git a/tool/src/access/mod.rs → tools/system76_ectool/src/access/mod.rs b/tool/src/access/mod.rs → tools/system76_ectool/src/access/mod.rs
diff --git a/tool/src/ec.rs → tools/system76_ectool/src/ec.rs b/tool/src/ec.rs → tools/system76_ectool/src/ec.rs
diff --git a/tool/src/error.rs → tools/system76_ectool/src/error.rs b/tool/src/error.rs → tools/system76_ectool/src/error.rs
diff --git a/tool/src/firmware.rs → tools/system76_ectool/src/firmware.rs b/tool/src/firmware.rs → tools/system76_ectool/src/firmware.rs
diff --git a/tool/src/legacy.rs → tools/system76_ectool/src/legacy.rs b/tool/src/legacy.rs → tools/system76_ectool/src/legacy.rs
diff --git a/tool/src/lib.rs → tools/system76_ectool/src/lib.rs b/tool/src/lib.rs → tools/system76_ectool/src/lib.rs
diff --git a/tool/src/main.rs → tools/system76_ectool/src/main.rs b/tool/src/main.rs → tools/system76_ectool/src/main.rs
diff --git a/tool/src/pmc.rs → tools/system76_ectool/src/pmc.rs b/tool/src/pmc.rs → tools/system76_ectool/src/pmc.rs
diff --git a/tool/src/spi.rs → tools/system76_ectool/src/spi.rs b/tool/src/spi.rs → tools/system76_ectool/src/spi.rs
diff --git a/tool/src/super_io.rs → tools/system76_ectool/src/super_io.rs b/tool/src/super_io.rs → tools/system76_ectool/src/super_io.rs
diff --git a/tool/src/timeout.rs → tools/system76_ectool/src/timeout.rs b/tool/src/timeout.rs → tools/system76_ectool/src/timeout.rs