diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d763d21ca..ddca6aa0f 100644 --- 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 index 37f5b615b..3afab1489 100644 --- 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 index 7a12488a0..535dfbf2c 100755 --- 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 index e92d0f487..5880bae1d 100644 --- 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 index 11017e590..c9d972329 100644 --- 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 b/tools/containers/Makefile similarity index 100% rename from containers/Makefile rename to tools/containers/Makefile diff --git a/containers/ec/Containerfile b/tools/containers/ec/Containerfile similarity index 100% rename from containers/ec/Containerfile rename to tools/containers/ec/Containerfile diff --git a/ecflash b/tools/ecflash similarity index 100% rename from ecflash rename to tools/ecflash diff --git a/ecsim b/tools/ecsim similarity index 100% rename from ecsim rename to tools/ecsim diff --git a/ecspy b/tools/ecspy similarity index 100% rename from ecspy rename to tools/ecspy diff --git a/tool/.gitignore b/tools/system76_ectool/.gitignore similarity index 100% rename from tool/.gitignore rename to tools/system76_ectool/.gitignore diff --git a/tool/Cargo.lock b/tools/system76_ectool/Cargo.lock similarity index 100% rename from tool/Cargo.lock rename to tools/system76_ectool/Cargo.lock diff --git a/tool/Cargo.toml b/tools/system76_ectool/Cargo.toml similarity index 100% rename from tool/Cargo.toml rename to tools/system76_ectool/Cargo.toml diff --git a/tool/LICENSE b/tools/system76_ectool/LICENSE similarity index 100% rename from tool/LICENSE rename to tools/system76_ectool/LICENSE diff --git a/tool/src/access/hid.rs b/tools/system76_ectool/src/access/hid.rs similarity index 100% rename from tool/src/access/hid.rs rename to tools/system76_ectool/src/access/hid.rs diff --git a/tool/src/access/lpc/direct.rs b/tools/system76_ectool/src/access/lpc/direct.rs similarity index 100% rename from tool/src/access/lpc/direct.rs rename to tools/system76_ectool/src/access/lpc/direct.rs diff --git a/tool/src/access/lpc/linux.rs b/tools/system76_ectool/src/access/lpc/linux.rs similarity index 100% rename from tool/src/access/lpc/linux.rs rename to tools/system76_ectool/src/access/lpc/linux.rs diff --git a/tool/src/access/lpc/mod.rs b/tools/system76_ectool/src/access/lpc/mod.rs similarity index 100% rename from tool/src/access/lpc/mod.rs rename to tools/system76_ectool/src/access/lpc/mod.rs diff --git a/tool/src/access/lpc/sim.rs b/tools/system76_ectool/src/access/lpc/sim.rs similarity index 100% rename from tool/src/access/lpc/sim.rs rename to tools/system76_ectool/src/access/lpc/sim.rs diff --git a/tool/src/access/mod.rs b/tools/system76_ectool/src/access/mod.rs similarity index 100% rename from tool/src/access/mod.rs rename to tools/system76_ectool/src/access/mod.rs diff --git a/tool/src/ec.rs b/tools/system76_ectool/src/ec.rs similarity index 100% rename from tool/src/ec.rs rename to tools/system76_ectool/src/ec.rs diff --git a/tool/src/error.rs b/tools/system76_ectool/src/error.rs similarity index 100% rename from tool/src/error.rs rename to tools/system76_ectool/src/error.rs diff --git a/tool/src/firmware.rs b/tools/system76_ectool/src/firmware.rs similarity index 100% rename from tool/src/firmware.rs rename to tools/system76_ectool/src/firmware.rs diff --git a/tool/src/legacy.rs b/tools/system76_ectool/src/legacy.rs similarity index 100% rename from tool/src/legacy.rs rename to tools/system76_ectool/src/legacy.rs diff --git a/tool/src/lib.rs b/tools/system76_ectool/src/lib.rs similarity index 100% rename from tool/src/lib.rs rename to tools/system76_ectool/src/lib.rs diff --git a/tool/src/main.rs b/tools/system76_ectool/src/main.rs similarity index 100% rename from tool/src/main.rs rename to tools/system76_ectool/src/main.rs diff --git a/tool/src/pmc.rs b/tools/system76_ectool/src/pmc.rs similarity index 100% rename from tool/src/pmc.rs rename to tools/system76_ectool/src/pmc.rs diff --git a/tool/src/spi.rs b/tools/system76_ectool/src/spi.rs similarity index 100% rename from tool/src/spi.rs rename to tools/system76_ectool/src/spi.rs diff --git a/tool/src/super_io.rs b/tools/system76_ectool/src/super_io.rs similarity index 100% rename from tool/src/super_io.rs rename to tools/system76_ectool/src/super_io.rs diff --git a/tool/src/timeout.rs b/tools/system76_ectool/src/timeout.rs similarity index 100% rename from tool/src/timeout.rs rename to tools/system76_ectool/src/timeout.rs