cleanup: clean up directory structure a bit

apfaudio · Dec 7, 2023 · bc863e1 · bc863e1
1 parent 68fbb5d
commit bc863e1
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 build/
 *__pycache__*
-firmware/litex-pac/src/*
+firmware/deps/generated-litex-pac/src/*
 .aider*
 *.fbi
diff --git a/.gitmodules b/.gitmodules
@@ -73,3 +73,6 @@
 [submodule "firmware/deps/riscv-rt"]
 	path = firmware/deps/riscv-rt
 	url = http://github.com/rust-embedded/riscv-rt
+[submodule "firmware/deps/ssd1322"]
+	path = firmware/deps/ssd1322
+	url = [email protected]:schnommus/ssd1322.git
diff --git a/firmware/build.sh b/firmware/build.sh
@@ -19,11 +19,11 @@ FW_ROOT=`pwd`
 OBJCOPY=${OBJCOPY:=riscv-none-elf-objcopy}
 
 # Generate the Rust CSR bindings spat out by the LiteX SOC generated.
-cd $FW_ROOT/litex-pac/src
+cd $FW_ROOT/deps/generated-litex-pac/src
 svd2rust -i $BUILD_DIR/csr.svd --target riscv
 
 # Build the firmware .elf file
-cd $FW_ROOT/litex-fw
+cd $FW_ROOT/polyvec
 cargo clippy --target=riscv32imac-unknown-none-elf
 cargo build --target=riscv32imac-unknown-none-elf --release
 

diff --git a/firmware/litex-pac/.gitignore → firmware/deps/generated-litex-pac/.gitignore b/firmware/litex-pac/.gitignore → firmware/deps/generated-litex-pac/.gitignore
diff --git a/firmware/litex-pac/Cargo.toml → firmware/deps/generated-litex-pac/Cargo.toml b/firmware/litex-pac/Cargo.toml → firmware/deps/generated-litex-pac/Cargo.toml
diff --git a/firmware/ssd1322 → firmware/deps/ssd1322 b/firmware/ssd1322 → firmware/deps/ssd1322
diff --git a/firmware/litex-pac/src/GENERATED b/firmware/litex-pac/src/GENERATED
diff --git a/firmware/litex-fw/.cargo/config → firmware/polyvec/.cargo/config b/firmware/litex-fw/.cargo/config → firmware/polyvec/.cargo/config
diff --git a/firmware/litex-fw/.gitignore → firmware/polyvec/.gitignore b/firmware/litex-fw/.gitignore → firmware/polyvec/.gitignore
diff --git a/firmware/litex-fw/Cargo.lock → firmware/polyvec/Cargo.lock b/firmware/litex-fw/Cargo.lock → firmware/polyvec/Cargo.lock
diff --git a/firmware/litex-fw/Cargo.toml → firmware/polyvec/Cargo.toml b/firmware/litex-fw/Cargo.toml → firmware/polyvec/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "litex-fw"
+name = "polyvec"
 version = "0.1.0"
 edition = "2021"
 
@@ -17,8 +17,8 @@ path = "src/main.rs"
 riscv = { version = "0.10.1", features = ["critical-section-single-hart"] }
 riscv-rt = { path = "../deps/riscv-rt", features = ["single-hart"] }
 litex-hal = { path = "../deps/rust-litex-hal", features = ["gpio"] }
-litex-pac = { path = "../litex-pac", features = ["rt"] }
-ssd1322 = { path = "../ssd1322", features = [] }
+litex-pac = { path = "../deps/generated-litex-pac", features = ["rt"] }
+ssd1322 = { path = "../deps/ssd1322", features = [] }
 embedded-midi = { path = "../deps/embedded-midi" }
 micromath = "2.0.0"
 midi-types = "0.1.7"

diff --git a/firmware/litex-fw/build.rs → firmware/polyvec/build.rs b/firmware/litex-fw/build.rs → firmware/polyvec/build.rs
diff --git a/firmware/litex-fw/memory.x → firmware/polyvec/memory.x b/firmware/litex-fw/memory.x → firmware/polyvec/memory.x
diff --git a/firmware/litex-fw/src/draw.rs → firmware/polyvec/src/draw.rs b/firmware/litex-fw/src/draw.rs → firmware/polyvec/src/draw.rs
diff --git a/firmware/litex-fw/src/gw.rs → firmware/polyvec/src/gw.rs b/firmware/litex-fw/src/gw.rs → firmware/polyvec/src/gw.rs
diff --git a/firmware/litex-fw/src/lib.rs → firmware/polyvec/src/lib.rs b/firmware/litex-fw/src/lib.rs → firmware/polyvec/src/lib.rs
diff --git a/firmware/litex-fw/src/log.rs → firmware/polyvec/src/log.rs b/firmware/litex-fw/src/log.rs → firmware/polyvec/src/log.rs
diff --git a/firmware/litex-fw/src/main.rs → firmware/polyvec/src/main.rs b/firmware/litex-fw/src/main.rs → firmware/polyvec/src/main.rs
diff --git a/firmware/litex-fw/src/opt.rs → firmware/polyvec/src/opt.rs b/firmware/litex-fw/src/opt.rs → firmware/polyvec/src/opt.rs
diff --git a/firmware/litex-fw/src/voice.rs → firmware/polyvec/src/voice.rs b/firmware/litex-fw/src/voice.rs → firmware/polyvec/src/voice.rs