From 45f3dc9c414af13c18bb498c42c02afd61a0c927 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@pm.me>
Date: Tue, 7 Oct 2025 15:49:24 +0200
Subject: [PATCH] re-structure project

---
 .cargo/config.toml.template                   |  21 --
 .gitignore                                    |   3 +-
 Cargo.toml                                    |  37 ---
 justfile                                      |  21 ++
 tools/Cargo.lock                              | 312 ++++++++++++++++++
 tools/Cargo.toml                              |   6 +
 .../boot-image-test}/.gitignore               |   0
 .../boot-image-test}/Cargo.lock               |   0
 .../boot-image-test}/Cargo.toml               |   6 +-
 .../boot-image-test}/src/main.rs              |   2 +-
 tools/zynq7000-ps7init-extract/Cargo.lock     | 251 ++++++++++++++
 .../zynq7000-ps7init-extract}/Cargo.toml      |   1 +
 tools/zynq7000-ps7init-extract/src/main.rs    |  20 ++
 zynq/.cargo/config.toml                       |  18 +
 zynq/.gitignore                               |   1 +
 zynq/Cargo.toml                               |  17 +
 .../examples}/embassy/Cargo.toml              |  22 +-
 {examples => zynq/examples}/embassy/build.rs  |   0
 {examples => zynq/examples}/embassy/memory.x  |   0
 .../embassy/src/bin/dht22-open-drain-pins.rs  |   0
 .../embassy/src/bin/logger-non-blocking.rs    |   0
 .../examples}/embassy/src/bin/pwm.rs          |   0
 .../examples}/embassy/src/main.rs             |   0
 {examples => zynq/examples}/simple/Cargo.toml |   0
 {examples => zynq/examples}/simple/build.rs   |   0
 {examples => zynq/examples}/simple/memory.x   |   0
 .../examples}/simple/src/bin/gtc-ticks.rs     |   0
 .../examples}/simple/src/bin/logger.rs        |   0
 .../examples}/simple/src/main.rs              |   0
 .../examples}/zedboard/Cargo.toml             |   0
 {examples => zynq/examples}/zedboard/build.rs |   0
 {examples => zynq/examples}/zedboard/memory.x |   0
 .../examples}/zedboard/src/bin/ethernet.rs    |   0
 .../zedboard/src/bin/l3gd20h-i2c-mio.rs       |   0
 .../zedboard/src/bin/l3gd20h-spi-mio.rs       |   0
 .../examples}/zedboard/src/bin/qspi.rs        |   0
 .../zedboard/src/bin/uart-blocking.rs         |   0
 .../zedboard/src/bin/uart-non-blocking.rs     |   0
 .../examples}/zedboard/src/lib.rs             |   0
 .../examples}/zedboard/src/main.rs            |   0
 gdb.gdb => zynq/gdb.gdb                       |   0
 .../rust-toolchain.toml                       |   1 -
 .../zedboard-bsp}/Cargo.toml                  |   0
 .../zedboard-bsp}/src/lib.rs                  |   0
 .../zedboard-bsp}/src/phy_marvell.rs          |   0
 .../zedboard-bsp}/src/qspi_spansion.rs        |   0
 .../zedboard-fsbl}/Cargo.toml                 |   2 +-
 .../zedboard-fsbl}/build.rs                   |   0
 .../zedboard-fsbl}/memory.x                   |   0
 .../zedboard-fsbl}/src/ddr_cfg.rs             |   0
 .../zedboard-fsbl}/src/main.rs                |   0
 .../zedboard-qspi-flasher}/Cargo.toml         |   2 +-
 .../zedboard-qspi-flasher}/build.rs           |   0
 .../zedboard-qspi-flasher}/memory.x           |   0
 .../zedboard-qspi-flasher}/qspi-flasher.tcl   |   0
 .../zedboard-qspi-flasher}/src/main.rs        |   0
 .../zynq7000-embassy}/Cargo.toml              |   0
 .../zynq7000-embassy}/LICENSE-APACHE          |   0
 .../zynq7000-embassy}/LICENSE-MIT             |   0
 .../zynq7000-embassy}/README.md               |   0
 .../zynq7000-embassy}/src/lib.rs              |   0
 .../zynq7000-hal}/Cargo.toml                  |   0
 .../zynq7000-hal}/LICENSE-APACHE              |   0
 .../zynq7000-hal}/LICENSE-MIT                 |   0
 {zynq7000-hal => zynq/zynq7000-hal}/README.md |   0
 {zynq7000-hal => zynq/zynq7000-hal}/docs.sh   |   0
 .../zynq7000-hal}/src/cache.rs                |   0
 .../zynq7000-hal}/src/clocks/mod.rs           |   0
 .../zynq7000-hal}/src/clocks/pll.rs           |   0
 .../zynq7000-hal}/src/ddr/ll.rs               |   0
 .../zynq7000-hal}/src/ddr/mod.rs              |   0
 .../zynq7000-hal}/src/devcfg.rs               |   0
 .../zynq7000-hal}/src/eth/embassy_net.rs      |   0
 .../zynq7000-hal}/src/eth/ll.rs               |   0
 .../zynq7000-hal}/src/eth/mdio.rs             |   0
 .../zynq7000-hal}/src/eth/mod.rs              |   0
 .../zynq7000-hal}/src/eth/rx_descr.rs         |   0
 .../zynq7000-hal}/src/eth/smoltcp.rs          |   0
 .../zynq7000-hal}/src/eth/tx_descr.rs         |   0
 .../zynq7000-hal}/src/gic.rs                  |   0
 .../zynq7000-hal}/src/gpio/emio.rs            |   0
 .../zynq7000-hal}/src/gpio/ll.rs              |   0
 .../zynq7000-hal}/src/gpio/mio.rs             |   0
 .../zynq7000-hal}/src/gpio/mod.rs             |   0
 .../zynq7000-hal}/src/gtc.rs                  |   0
 .../zynq7000-hal}/src/i2c.rs                  |   0
 .../zynq7000-hal}/src/l2_cache.rs             |   0
 .../zynq7000-hal}/src/lib.rs                  |   0
 .../zynq7000-hal}/src/log.rs                  |   0
 .../zynq7000-hal}/src/prelude.rs              |   0
 .../zynq7000-hal}/src/priv_tim.rs             |   0
 .../zynq7000-hal}/src/qspi/lqspi_configs.rs   |   0
 .../zynq7000-hal}/src/qspi/mod.rs             |   0
 .../zynq7000-hal}/src/slcr.rs                 |   0
 .../zynq7000-hal}/src/spi/asynch.rs           |   0
 .../zynq7000-hal}/src/spi/mod.rs              |   0
 .../zynq7000-hal}/src/time.rs                 |   0
 .../zynq7000-hal}/src/ttc.rs                  |   0
 .../zynq7000-hal}/src/uart/mod.rs             |   0
 .../zynq7000-hal}/src/uart/rx.rs              |   0
 .../zynq7000-hal}/src/uart/tx.rs              |   0
 .../zynq7000-hal}/src/uart/tx_async.rs        |   0
 .../zynq7000-mmu}/Cargo.toml                  |   0
 .../zynq7000-mmu}/src/lib.rs                  |   0
 {zynq7000-rt => zynq/zynq7000-rt}/Cargo.toml  |   0
 {zynq7000-rt => zynq/zynq7000-rt}/README.md   |   0
 {zynq7000-rt => zynq/zynq7000-rt}/docs.sh     |   0
 .../zynq7000-rt}/regen-table.sh               |   0
 .../zynq7000-rt}/src/bin/table-gen.rs         |   0
 {zynq7000-rt => zynq/zynq7000-rt}/src/lib.rs  |   0
 {zynq7000-rt => zynq/zynq7000-rt}/src/mmu.rs  |   0
 .../zynq7000-rt}/src/mmu_table.rs             |   0
 {zynq7000-rt => zynq/zynq7000-rt}/src/rt.rs   |   0
 {zynq7000 => zynq/zynq7000}/Cargo.toml        |   0
 {zynq7000 => zynq/zynq7000}/LICENSE-APACHE    |   0
 {zynq7000 => zynq/zynq7000}/LICENSE-MIT       |   0
 {zynq7000 => zynq/zynq7000}/README.md         |   0
 {zynq7000 => zynq/zynq7000}/build.rs          |   0
 {zynq7000 => zynq/zynq7000}/docs.sh           |   0
 {zynq7000 => zynq/zynq7000}/src/ddrc.rs       |   0
 {zynq7000 => zynq/zynq7000}/src/devcfg.rs     |   0
 {zynq7000 => zynq/zynq7000}/src/eth.rs        |   0
 {zynq7000 => zynq/zynq7000}/src/gic.rs        |   0
 {zynq7000 => zynq/zynq7000}/src/gpio.rs       |   0
 {zynq7000 => zynq/zynq7000}/src/gtc.rs        |   0
 {zynq7000 => zynq/zynq7000}/src/i2c.rs        |   0
 {zynq7000 => zynq/zynq7000}/src/l2_cache.rs   |   0
 {zynq7000 => zynq/zynq7000}/src/lib.rs        |   0
 {zynq7000 => zynq/zynq7000}/src/mpcore.rs     |   0
 {zynq7000 => zynq/zynq7000}/src/priv_tim.rs   |   0
 {zynq7000 => zynq/zynq7000}/src/qspi.rs       |   0
 .../zynq7000}/src/slcr/clocks.rs              |   0
 .../zynq7000}/src/slcr/ddriob.rs              |   0
 {zynq7000 => zynq/zynq7000}/src/slcr/mio.rs   |   0
 {zynq7000 => zynq/zynq7000}/src/slcr/mod.rs   |   0
 {zynq7000 => zynq/zynq7000}/src/slcr/reset.rs |   0
 {zynq7000 => zynq/zynq7000}/src/spi.rs        |   0
 {zynq7000 => zynq/zynq7000}/src/ttc.rs        |   0
 {zynq7000 => zynq/zynq7000}/src/uart.rs       |   0
 {zynq7000 => zynq/zynq7000}/src/xadc.rs       |   0
 zynq7000-boot-image/.gitignore                |   1 +
 zynq7000-ps7init-extract/src/main.rs          |   3 -
 zynq7000-rt/Cargo.lock                        |   7 -
 143 files changed, 674 insertions(+), 80 deletions(-)
 delete mode 100644 Cargo.toml
 create mode 100644 tools/Cargo.lock
 create mode 100644 tools/Cargo.toml
 rename {zynq7000-boot-image/tester => tools/boot-image-test}/.gitignore (100%)
 rename {zynq7000-boot-image/tester => tools/boot-image-test}/Cargo.lock (100%)
 rename {zynq7000-boot-image/tester => tools/boot-image-test}/Cargo.toml (56%)
 rename {zynq7000-boot-image/tester => tools/boot-image-test}/src/main.rs (98%)
 create mode 100644 tools/zynq7000-ps7init-extract/Cargo.lock
 rename {zynq7000-ps7init-extract => tools/zynq7000-ps7init-extract}/Cargo.toml (66%)
 create mode 100644 tools/zynq7000-ps7init-extract/src/main.rs
 create mode 100644 zynq/.cargo/config.toml
 create mode 100644 zynq/.gitignore
 create mode 100644 zynq/Cargo.toml
 rename {examples => zynq/examples}/embassy/Cargo.toml (72%)
 rename {examples => zynq/examples}/embassy/build.rs (100%)
 rename {examples => zynq/examples}/embassy/memory.x (100%)
 rename {examples => zynq/examples}/embassy/src/bin/dht22-open-drain-pins.rs (100%)
 rename {examples => zynq/examples}/embassy/src/bin/logger-non-blocking.rs (100%)
 rename {examples => zynq/examples}/embassy/src/bin/pwm.rs (100%)
 rename {examples => zynq/examples}/embassy/src/main.rs (100%)
 rename {examples => zynq/examples}/simple/Cargo.toml (100%)
 rename {examples => zynq/examples}/simple/build.rs (100%)
 rename {examples => zynq/examples}/simple/memory.x (100%)
 rename {examples => zynq/examples}/simple/src/bin/gtc-ticks.rs (100%)
 rename {examples => zynq/examples}/simple/src/bin/logger.rs (100%)
 rename {examples => zynq/examples}/simple/src/main.rs (100%)
 rename {examples => zynq/examples}/zedboard/Cargo.toml (100%)
 rename {examples => zynq/examples}/zedboard/build.rs (100%)
 rename {examples => zynq/examples}/zedboard/memory.x (100%)
 rename {examples => zynq/examples}/zedboard/src/bin/ethernet.rs (100%)
 rename {examples => zynq/examples}/zedboard/src/bin/l3gd20h-i2c-mio.rs (100%)
 rename {examples => zynq/examples}/zedboard/src/bin/l3gd20h-spi-mio.rs (100%)
 rename {examples => zynq/examples}/zedboard/src/bin/qspi.rs (100%)
 rename {examples => zynq/examples}/zedboard/src/bin/uart-blocking.rs (100%)
 rename {examples => zynq/examples}/zedboard/src/bin/uart-non-blocking.rs (100%)
 rename {examples => zynq/examples}/zedboard/src/lib.rs (100%)
 rename {examples => zynq/examples}/zedboard/src/main.rs (100%)
 rename gdb.gdb => zynq/gdb.gdb (100%)
 rename rust-toolchain.toml => zynq/rust-toolchain.toml (60%)
 rename {zedboard-bsp => zynq/zedboard-bsp}/Cargo.toml (100%)
 rename {zedboard-bsp => zynq/zedboard-bsp}/src/lib.rs (100%)
 rename {zedboard-bsp => zynq/zedboard-bsp}/src/phy_marvell.rs (100%)
 rename {zedboard-bsp => zynq/zedboard-bsp}/src/qspi_spansion.rs (100%)
 rename {zedboard-fsbl => zynq/zedboard-fsbl}/Cargo.toml (91%)
 rename {zedboard-fsbl => zynq/zedboard-fsbl}/build.rs (100%)
 rename {zedboard-fsbl => zynq/zedboard-fsbl}/memory.x (100%)
 rename {zedboard-fsbl => zynq/zedboard-fsbl}/src/ddr_cfg.rs (100%)
 rename {zedboard-fsbl => zynq/zedboard-fsbl}/src/main.rs (100%)
 rename {zedboard-qspi-flasher => zynq/zedboard-qspi-flasher}/Cargo.toml (85%)
 rename {zedboard-qspi-flasher => zynq/zedboard-qspi-flasher}/build.rs (100%)
 rename {zedboard-qspi-flasher => zynq/zedboard-qspi-flasher}/memory.x (100%)
 rename {zedboard-qspi-flasher => zynq/zedboard-qspi-flasher}/qspi-flasher.tcl (100%)
 rename {zedboard-qspi-flasher => zynq/zedboard-qspi-flasher}/src/main.rs (100%)
 rename {zynq7000-embassy => zynq/zynq7000-embassy}/Cargo.toml (100%)
 rename {zynq7000-embassy => zynq/zynq7000-embassy}/LICENSE-APACHE (100%)
 rename {zynq7000-embassy => zynq/zynq7000-embassy}/LICENSE-MIT (100%)
 rename {zynq7000-embassy => zynq/zynq7000-embassy}/README.md (100%)
 rename {zynq7000-embassy => zynq/zynq7000-embassy}/src/lib.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/Cargo.toml (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/LICENSE-APACHE (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/LICENSE-MIT (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/README.md (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/docs.sh (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/cache.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/clocks/mod.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/clocks/pll.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/ddr/ll.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/ddr/mod.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/devcfg.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/eth/embassy_net.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/eth/ll.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/eth/mdio.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/eth/mod.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/eth/rx_descr.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/eth/smoltcp.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/eth/tx_descr.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/gic.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/gpio/emio.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/gpio/ll.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/gpio/mio.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/gpio/mod.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/gtc.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/i2c.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/l2_cache.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/lib.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/log.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/prelude.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/priv_tim.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/qspi/lqspi_configs.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/qspi/mod.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/slcr.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/spi/asynch.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/spi/mod.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/time.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/ttc.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/uart/mod.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/uart/rx.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/uart/tx.rs (100%)
 rename {zynq7000-hal => zynq/zynq7000-hal}/src/uart/tx_async.rs (100%)
 rename {zynq7000-mmu => zynq/zynq7000-mmu}/Cargo.toml (100%)
 rename {zynq7000-mmu => zynq/zynq7000-mmu}/src/lib.rs (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/Cargo.toml (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/README.md (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/docs.sh (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/regen-table.sh (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/src/bin/table-gen.rs (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/src/lib.rs (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/src/mmu.rs (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/src/mmu_table.rs (100%)
 rename {zynq7000-rt => zynq/zynq7000-rt}/src/rt.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/Cargo.toml (100%)
 rename {zynq7000 => zynq/zynq7000}/LICENSE-APACHE (100%)
 rename {zynq7000 => zynq/zynq7000}/LICENSE-MIT (100%)
 rename {zynq7000 => zynq/zynq7000}/README.md (100%)
 rename {zynq7000 => zynq/zynq7000}/build.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/docs.sh (100%)
 rename {zynq7000 => zynq/zynq7000}/src/ddrc.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/devcfg.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/eth.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/gic.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/gpio.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/gtc.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/i2c.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/l2_cache.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/lib.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/mpcore.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/priv_tim.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/qspi.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/slcr/clocks.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/slcr/ddriob.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/slcr/mio.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/slcr/mod.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/slcr/reset.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/spi.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/ttc.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/uart.rs (100%)
 rename {zynq7000 => zynq/zynq7000}/src/xadc.rs (100%)
 create mode 100644 zynq7000-boot-image/.gitignore
 delete mode 100644 zynq7000-ps7init-extract/src/main.rs
 delete mode 100644 zynq7000-rt/Cargo.lock

diff --git a/.cargo/config.toml.template b/.cargo/config.toml.template
index a2dd61b..5092f1a 100644
--- a/.cargo/config.toml.template
+++ b/.cargo/config.toml.template
@@ -1,24 +1,3 @@
-[target.armv7a-none-eabihf]
-runner = "./scripts/runner.sh"
-
-rustflags = [
-  "-Ctarget-cpu=cortex-a9",
-  "-Ctarget-feature=+vfp3",
-  "-Ctarget-feature=+neon",
-  "-Clink-arg=-Tlink.x",
-  # If this is not enabled, debugging / stepping can become problematic.
-  "-Cforce-frame-pointers=yes",
-  # Can be useful for debugging.
-  # "-Clink-args=-Map=app.map"
-]
-
-# Tier 3 target, so no pre-compiled artifacts included.
-[unstable]
-build-std = ["core", "alloc"]
-
-[build]
-target = "armv7a-none-eabihf"
-
 [env]
 # The following two env variables need to be set for the supplied runner.sh script to work.
 
diff --git a/.gitignore b/.gitignore
index cad995a..a2e6b44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-/target
+target
+
 /app.map
 /xsct-output.log
 /.vscode
diff --git a/Cargo.toml b/Cargo.toml
deleted file mode 100644
index 9e0bcc6..0000000
--- a/Cargo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-[workspace]
-resolver = "3"
-members = [
-  "zynq7000-rt",
-  "zynq7000-mmu",
-  "zynq7000",
-  "zynq7000-hal",
-  "zynq7000-embassy",
-  "zynq7000-boot-image",
-
-  "examples/simple",
-  "examples/embassy",
-  "examples/zedboard",
-
-  "zedboard-fsbl",
-  "zedboard-bsp",
-  "zedboard-qspi-flasher",
-]
-
-exclude = [
-  "zynq-boot-image/tester",
-  "zynq7000-ps7init-extract",
-]
-
-# cargo build/run --release
-[profile.release]
-codegen-units = 1
-debug = 2
-debug-assertions = false # <-
-incremental = false
-lto = true
-opt-level = 3            # <-
-overflow-checks = false  # <-
-
-[profile.small]
-inherits = "release"
-opt-level = "z"
diff --git a/justfile b/justfile
index a761458..3272fa1 100644
--- a/justfile
+++ b/justfile
@@ -1,4 +1,25 @@
+check: check-zynq check-tools check-boot-image
 
+[working-directory: 'zynq']
+check-zynq:
+  cargo check
+[working-directory: 'tools']
+check-tools:
+  cargo check
+[working-directory: 'zynq7000-boot-image']
+check-boot-image:
+  cargo check 
+
+[working-directory: 'zynq']
+build-zynq:
+  cargo check
+[working-directory: 'tools']
+build-tools:
+  cargo check
+[working-directory: 'zynq7000-boot-image']
+build-boot-image:
+  cargo check 
+  
 [working-directory: 'zynq-boot-image/staging']
 bootgen:
   bootgen -arch zynq -image boot.bif -o boot.bin -w on
diff --git a/tools/Cargo.lock b/tools/Cargo.lock
new file mode 100644
index 0000000..69d3d27
--- /dev/null
+++ b/tools/Cargo.lock
@@ -0,0 +1,312 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "anstream"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys",
+]
+
+[[package]]
+name = "arbitrary-int"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "825297538d77367557b912770ca3083f778a196054b3ee63b22673c4a3cae0a5"
+
+[[package]]
+name = "arbitrary-int"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c858caffa49edfc4ecc45a4bec37abd3e88041a2903816f10f990b7b41abc281"
+
+[[package]]
+name = "bitbybit"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec187a89ab07e209270175faf9e07ceb2755d984954e58a2296e325ddece2762"
+dependencies = [
+ "arbitrary-int 1.3.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "boot-image-test"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "zynq7000-boot-image",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "zynq7000-boot-image"
+version = "0.1.0"
+dependencies = [
+ "arbitrary-int 2.0.0",
+ "bitbybit",
+ "thiserror",
+]
+
+[[package]]
+name = "zynq7000-ps7init-extract"
+version = "0.1.0"
+dependencies = [
+ "clap",
+]
diff --git a/tools/Cargo.toml b/tools/Cargo.toml
new file mode 100644
index 0000000..c07381e
--- /dev/null
+++ b/tools/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+resolver = "3"
+members = [
+  "boot-image-test",
+  "zynq7000-ps7init-extract",
+]
diff --git a/zynq7000-boot-image/tester/.gitignore b/tools/boot-image-test/.gitignore
similarity index 100%
rename from zynq7000-boot-image/tester/.gitignore
rename to tools/boot-image-test/.gitignore
diff --git a/zynq7000-boot-image/tester/Cargo.lock b/tools/boot-image-test/Cargo.lock
similarity index 100%
rename from zynq7000-boot-image/tester/Cargo.lock
rename to tools/boot-image-test/Cargo.lock
diff --git a/zynq7000-boot-image/tester/Cargo.toml b/tools/boot-image-test/Cargo.toml
similarity index 56%
rename from zynq7000-boot-image/tester/Cargo.toml
rename to tools/boot-image-test/Cargo.toml
index 4cc3de7..cdca892 100644
--- a/zynq7000-boot-image/tester/Cargo.toml
+++ b/tools/boot-image-test/Cargo.toml
@@ -1,10 +1,8 @@
-[workspace]
-
 [package]
-name = "tester"
+name = "boot-image-test"
 version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-zynq-boot-image= { path = ".." }
+zynq7000-boot-image= { path = "../../zynq7000-boot-image" }
 clap = { version = "4", features = ["derive"] }
diff --git a/zynq7000-boot-image/tester/src/main.rs b/tools/boot-image-test/src/main.rs
similarity index 98%
rename from zynq7000-boot-image/tester/src/main.rs
rename to tools/boot-image-test/src/main.rs
index bff0c55..c793ef5 100644
--- a/zynq7000-boot-image/tester/src/main.rs
+++ b/tools/boot-image-test/src/main.rs
@@ -2,7 +2,7 @@
 use std::{io::Read, path::Path};
 
 use clap::Parser as _;
-use zynq_boot_image::{BootHeader, FIXED_BOOT_HEADER_SIZE};
+use zynq7000_boot_image::{BootHeader, FIXED_BOOT_HEADER_SIZE};
 
 #[derive(clap::Parser, Debug)]
 #[command(version, about)]
diff --git a/tools/zynq7000-ps7init-extract/Cargo.lock b/tools/zynq7000-ps7init-extract/Cargo.lock
new file mode 100644
index 0000000..074b1ff
--- /dev/null
+++ b/tools/zynq7000-ps7init-extract/Cargo.lock
@@ -0,0 +1,251 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "anstream"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "zynq7000-ps7init-extract"
+version = "0.1.0"
+dependencies = [
+ "clap",
+]
diff --git a/zynq7000-ps7init-extract/Cargo.toml b/tools/zynq7000-ps7init-extract/Cargo.toml
similarity index 66%
rename from zynq7000-ps7init-extract/Cargo.toml
rename to tools/zynq7000-ps7init-extract/Cargo.toml
index 0c9c282..bc72fdc 100644
--- a/zynq7000-ps7init-extract/Cargo.toml
+++ b/tools/zynq7000-ps7init-extract/Cargo.toml
@@ -4,3 +4,4 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+clap = { version = "4", features = ["derive"] }
diff --git a/tools/zynq7000-ps7init-extract/src/main.rs b/tools/zynq7000-ps7init-extract/src/main.rs
new file mode 100644
index 0000000..3bef838
--- /dev/null
+++ b/tools/zynq7000-ps7init-extract/src/main.rs
@@ -0,0 +1,20 @@
+use std::path::Path;
+
+use clap::Parser as _;
+
+#[derive(clap::Parser, Debug)]
+#[command(version, about)]
+pub struct Cli {
+    /// Path to ps7init.tcl file.
+    #[arg(short, long)]
+    path: String,
+}
+
+fn main() {
+    let cli = Cli::parse();
+    let ps7init_tcl = Path::new(&cli.path);
+    if !ps7init_tcl.exists() {
+        eprintln!("File not found: {}", ps7init_tcl.display());
+        std::process::exit(1);
+    }
+}
diff --git a/zynq/.cargo/config.toml b/zynq/.cargo/config.toml
new file mode 100644
index 0000000..15ce3b2
--- /dev/null
+++ b/zynq/.cargo/config.toml
@@ -0,0 +1,18 @@
+[target.armv7a-none-eabihf]
+rustflags = [
+  "-Ctarget-cpu=cortex-a9",
+  "-Ctarget-feature=+vfp3",
+  "-Ctarget-feature=+neon",
+  "-Clink-arg=-Tlink.x",
+  # If this is not enabled, debugging / stepping can become problematic.
+  "-Cforce-frame-pointers=yes",
+  # Can be useful for debugging.
+  # "-Clink-args=-Map=app.map"
+]
+
+# Tier 3 target, so no pre-compiled artifacts included.
+[unstable]
+build-std = ["core", "alloc"]
+
+[build]
+target = "armv7a-none-eabihf"
diff --git a/zynq/.gitignore b/zynq/.gitignore
new file mode 100644
index 0000000..5a44eef
--- /dev/null
+++ b/zynq/.gitignore
@@ -0,0 +1 @@
+/Cargo.lock
diff --git a/zynq/Cargo.toml b/zynq/Cargo.toml
new file mode 100644
index 0000000..2adf0c5
--- /dev/null
+++ b/zynq/Cargo.toml
@@ -0,0 +1,17 @@
+[workspace]
+resolver = "3"
+members = [
+  "zynq7000-rt",
+  "zynq7000-mmu",
+  "zynq7000",
+  "zynq7000-hal",
+  "zynq7000-embassy",
+
+  "examples/simple",
+  "examples/embassy",
+  "examples/zedboard",
+
+  "zedboard-fsbl",
+  "zedboard-bsp",
+  "zedboard-qspi-flasher",
+]
diff --git a/examples/embassy/Cargo.toml b/zynq/examples/embassy/Cargo.toml
similarity index 72%
rename from examples/embassy/Cargo.toml
rename to zynq/examples/embassy/Cargo.toml
index b616e9d..f32f638 100644
--- a/examples/embassy/Cargo.toml
+++ b/zynq/examples/embassy/Cargo.toml
@@ -32,7 +32,23 @@ embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", features
 # TODO: Remove generic-queue-16 feature as soon as upstream executor is used again.
 embassy-time = { version = "0.5", features = ["tick-hz-1_000_000", "generic-queue-16"] }
 
-[profile.release]
+# cargo build/run
+[profile.dev]
+# default is opt-level = '0', but that makes very
+# verbose machine code
+opt-level = 's'
+# trade compile speed for slightly better optimisations
 codegen-units = 1
-debug = true
-lto = true
+
+# cargo build/run --release
+[profile.release]
+# default is opt-level = '3', but that makes quite
+# verbose machine code
+opt-level = 's'
+# trade compile speed for slightly better optimisations
+codegen-units = 1
+# Use Link Time Optimisations to further inline things across
+# crates
+lto = 'fat'
+# Leave the debug symbols in (default is no debug info)
+debug = 2
diff --git a/examples/embassy/build.rs b/zynq/examples/embassy/build.rs
similarity index 100%
rename from examples/embassy/build.rs
rename to zynq/examples/embassy/build.rs
diff --git a/examples/embassy/memory.x b/zynq/examples/embassy/memory.x
similarity index 100%
rename from examples/embassy/memory.x
rename to zynq/examples/embassy/memory.x
diff --git a/examples/embassy/src/bin/dht22-open-drain-pins.rs b/zynq/examples/embassy/src/bin/dht22-open-drain-pins.rs
similarity index 100%
rename from examples/embassy/src/bin/dht22-open-drain-pins.rs
rename to zynq/examples/embassy/src/bin/dht22-open-drain-pins.rs
diff --git a/examples/embassy/src/bin/logger-non-blocking.rs b/zynq/examples/embassy/src/bin/logger-non-blocking.rs
similarity index 100%
rename from examples/embassy/src/bin/logger-non-blocking.rs
rename to zynq/examples/embassy/src/bin/logger-non-blocking.rs
diff --git a/examples/embassy/src/bin/pwm.rs b/zynq/examples/embassy/src/bin/pwm.rs
similarity index 100%
rename from examples/embassy/src/bin/pwm.rs
rename to zynq/examples/embassy/src/bin/pwm.rs
diff --git a/examples/embassy/src/main.rs b/zynq/examples/embassy/src/main.rs
similarity index 100%
rename from examples/embassy/src/main.rs
rename to zynq/examples/embassy/src/main.rs
diff --git a/examples/simple/Cargo.toml b/zynq/examples/simple/Cargo.toml
similarity index 100%
rename from examples/simple/Cargo.toml
rename to zynq/examples/simple/Cargo.toml
diff --git a/examples/simple/build.rs b/zynq/examples/simple/build.rs
similarity index 100%
rename from examples/simple/build.rs
rename to zynq/examples/simple/build.rs
diff --git a/examples/simple/memory.x b/zynq/examples/simple/memory.x
similarity index 100%
rename from examples/simple/memory.x
rename to zynq/examples/simple/memory.x
diff --git a/examples/simple/src/bin/gtc-ticks.rs b/zynq/examples/simple/src/bin/gtc-ticks.rs
similarity index 100%
rename from examples/simple/src/bin/gtc-ticks.rs
rename to zynq/examples/simple/src/bin/gtc-ticks.rs
diff --git a/examples/simple/src/bin/logger.rs b/zynq/examples/simple/src/bin/logger.rs
similarity index 100%
rename from examples/simple/src/bin/logger.rs
rename to zynq/examples/simple/src/bin/logger.rs
diff --git a/examples/simple/src/main.rs b/zynq/examples/simple/src/main.rs
similarity index 100%
rename from examples/simple/src/main.rs
rename to zynq/examples/simple/src/main.rs
diff --git a/examples/zedboard/Cargo.toml b/zynq/examples/zedboard/Cargo.toml
similarity index 100%
rename from examples/zedboard/Cargo.toml
rename to zynq/examples/zedboard/Cargo.toml
diff --git a/examples/zedboard/build.rs b/zynq/examples/zedboard/build.rs
similarity index 100%
rename from examples/zedboard/build.rs
rename to zynq/examples/zedboard/build.rs
diff --git a/examples/zedboard/memory.x b/zynq/examples/zedboard/memory.x
similarity index 100%
rename from examples/zedboard/memory.x
rename to zynq/examples/zedboard/memory.x
diff --git a/examples/zedboard/src/bin/ethernet.rs b/zynq/examples/zedboard/src/bin/ethernet.rs
similarity index 100%
rename from examples/zedboard/src/bin/ethernet.rs
rename to zynq/examples/zedboard/src/bin/ethernet.rs
diff --git a/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs b/zynq/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs
similarity index 100%
rename from examples/zedboard/src/bin/l3gd20h-i2c-mio.rs
rename to zynq/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs
diff --git a/examples/zedboard/src/bin/l3gd20h-spi-mio.rs b/zynq/examples/zedboard/src/bin/l3gd20h-spi-mio.rs
similarity index 100%
rename from examples/zedboard/src/bin/l3gd20h-spi-mio.rs
rename to zynq/examples/zedboard/src/bin/l3gd20h-spi-mio.rs
diff --git a/examples/zedboard/src/bin/qspi.rs b/zynq/examples/zedboard/src/bin/qspi.rs
similarity index 100%
rename from examples/zedboard/src/bin/qspi.rs
rename to zynq/examples/zedboard/src/bin/qspi.rs
diff --git a/examples/zedboard/src/bin/uart-blocking.rs b/zynq/examples/zedboard/src/bin/uart-blocking.rs
similarity index 100%
rename from examples/zedboard/src/bin/uart-blocking.rs
rename to zynq/examples/zedboard/src/bin/uart-blocking.rs
diff --git a/examples/zedboard/src/bin/uart-non-blocking.rs b/zynq/examples/zedboard/src/bin/uart-non-blocking.rs
similarity index 100%
rename from examples/zedboard/src/bin/uart-non-blocking.rs
rename to zynq/examples/zedboard/src/bin/uart-non-blocking.rs
diff --git a/examples/zedboard/src/lib.rs b/zynq/examples/zedboard/src/lib.rs
similarity index 100%
rename from examples/zedboard/src/lib.rs
rename to zynq/examples/zedboard/src/lib.rs
diff --git a/examples/zedboard/src/main.rs b/zynq/examples/zedboard/src/main.rs
similarity index 100%
rename from examples/zedboard/src/main.rs
rename to zynq/examples/zedboard/src/main.rs
diff --git a/gdb.gdb b/zynq/gdb.gdb
similarity index 100%
rename from gdb.gdb
rename to zynq/gdb.gdb
diff --git a/rust-toolchain.toml b/zynq/rust-toolchain.toml
similarity index 60%
rename from rust-toolchain.toml
rename to zynq/rust-toolchain.toml
index 0e3c7a9..5d56faf 100644
--- a/rust-toolchain.toml
+++ b/zynq/rust-toolchain.toml
@@ -1,3 +1,2 @@
 [toolchain]
-# channel = "stable"
 channel = "nightly"
diff --git a/zedboard-bsp/Cargo.toml b/zynq/zedboard-bsp/Cargo.toml
similarity index 100%
rename from zedboard-bsp/Cargo.toml
rename to zynq/zedboard-bsp/Cargo.toml
diff --git a/zedboard-bsp/src/lib.rs b/zynq/zedboard-bsp/src/lib.rs
similarity index 100%
rename from zedboard-bsp/src/lib.rs
rename to zynq/zedboard-bsp/src/lib.rs
diff --git a/zedboard-bsp/src/phy_marvell.rs b/zynq/zedboard-bsp/src/phy_marvell.rs
similarity index 100%
rename from zedboard-bsp/src/phy_marvell.rs
rename to zynq/zedboard-bsp/src/phy_marvell.rs
diff --git a/zedboard-bsp/src/qspi_spansion.rs b/zynq/zedboard-bsp/src/qspi_spansion.rs
similarity index 100%
rename from zedboard-bsp/src/qspi_spansion.rs
rename to zynq/zedboard-bsp/src/qspi_spansion.rs
diff --git a/zedboard-fsbl/Cargo.toml b/zynq/zedboard-fsbl/Cargo.toml
similarity index 91%
rename from zedboard-fsbl/Cargo.toml
rename to zynq/zedboard-fsbl/Cargo.toml
index 7aac6ef..c6008be 100644
--- a/zedboard-fsbl/Cargo.toml
+++ b/zynq/zedboard-fsbl/Cargo.toml
@@ -13,7 +13,7 @@ cortex-ar = "0.3"
 zynq7000-rt = { path = "../zynq7000-rt" }
 zynq7000 = { path = "../zynq7000" }
 zynq7000-hal = { path = "../zynq7000-hal" }
-zynq7000-boot-image = { path = "../zynq7000-boot-image" }
+zynq7000-boot-image = { path = "../../zynq7000-boot-image" }
 zedboard-bsp = { path = "../zedboard-bsp" }
 embedded-io = "0.7"
 embedded-hal = "1"
diff --git a/zedboard-fsbl/build.rs b/zynq/zedboard-fsbl/build.rs
similarity index 100%
rename from zedboard-fsbl/build.rs
rename to zynq/zedboard-fsbl/build.rs
diff --git a/zedboard-fsbl/memory.x b/zynq/zedboard-fsbl/memory.x
similarity index 100%
rename from zedboard-fsbl/memory.x
rename to zynq/zedboard-fsbl/memory.x
diff --git a/zedboard-fsbl/src/ddr_cfg.rs b/zynq/zedboard-fsbl/src/ddr_cfg.rs
similarity index 100%
rename from zedboard-fsbl/src/ddr_cfg.rs
rename to zynq/zedboard-fsbl/src/ddr_cfg.rs
diff --git a/zedboard-fsbl/src/main.rs b/zynq/zedboard-fsbl/src/main.rs
similarity index 100%
rename from zedboard-fsbl/src/main.rs
rename to zynq/zedboard-fsbl/src/main.rs
diff --git a/zedboard-qspi-flasher/Cargo.toml b/zynq/zedboard-qspi-flasher/Cargo.toml
similarity index 85%
rename from zedboard-qspi-flasher/Cargo.toml
rename to zynq/zedboard-qspi-flasher/Cargo.toml
index 682d7a5..11eb7ab 100644
--- a/zedboard-qspi-flasher/Cargo.toml
+++ b/zynq/zedboard-qspi-flasher/Cargo.toml
@@ -8,7 +8,7 @@ cortex-ar = { version = "0.3" }
 zynq7000-rt = { path = "../zynq7000-rt" }
 zynq7000 = { path = "../zynq7000" }
 zynq7000-hal = { path = "../zynq7000-hal" }
-zynq7000-boot-image = { path = "../zynq7000-boot-image" }
+zynq7000-boot-image = { path = "../../zynq7000-boot-image" }
 zedboard-bsp = { path = "../zedboard-bsp" }
 embedded-io = "0.7"
 embedded-hal = "1"
diff --git a/zedboard-qspi-flasher/build.rs b/zynq/zedboard-qspi-flasher/build.rs
similarity index 100%
rename from zedboard-qspi-flasher/build.rs
rename to zynq/zedboard-qspi-flasher/build.rs
diff --git a/zedboard-qspi-flasher/memory.x b/zynq/zedboard-qspi-flasher/memory.x
similarity index 100%
rename from zedboard-qspi-flasher/memory.x
rename to zynq/zedboard-qspi-flasher/memory.x
diff --git a/zedboard-qspi-flasher/qspi-flasher.tcl b/zynq/zedboard-qspi-flasher/qspi-flasher.tcl
similarity index 100%
rename from zedboard-qspi-flasher/qspi-flasher.tcl
rename to zynq/zedboard-qspi-flasher/qspi-flasher.tcl
diff --git a/zedboard-qspi-flasher/src/main.rs b/zynq/zedboard-qspi-flasher/src/main.rs
similarity index 100%
rename from zedboard-qspi-flasher/src/main.rs
rename to zynq/zedboard-qspi-flasher/src/main.rs
diff --git a/zynq7000-embassy/Cargo.toml b/zynq/zynq7000-embassy/Cargo.toml
similarity index 100%
rename from zynq7000-embassy/Cargo.toml
rename to zynq/zynq7000-embassy/Cargo.toml
diff --git a/zynq7000-embassy/LICENSE-APACHE b/zynq/zynq7000-embassy/LICENSE-APACHE
similarity index 100%
rename from zynq7000-embassy/LICENSE-APACHE
rename to zynq/zynq7000-embassy/LICENSE-APACHE
diff --git a/zynq7000-embassy/LICENSE-MIT b/zynq/zynq7000-embassy/LICENSE-MIT
similarity index 100%
rename from zynq7000-embassy/LICENSE-MIT
rename to zynq/zynq7000-embassy/LICENSE-MIT
diff --git a/zynq7000-embassy/README.md b/zynq/zynq7000-embassy/README.md
similarity index 100%
rename from zynq7000-embassy/README.md
rename to zynq/zynq7000-embassy/README.md
diff --git a/zynq7000-embassy/src/lib.rs b/zynq/zynq7000-embassy/src/lib.rs
similarity index 100%
rename from zynq7000-embassy/src/lib.rs
rename to zynq/zynq7000-embassy/src/lib.rs
diff --git a/zynq7000-hal/Cargo.toml b/zynq/zynq7000-hal/Cargo.toml
similarity index 100%
rename from zynq7000-hal/Cargo.toml
rename to zynq/zynq7000-hal/Cargo.toml
diff --git a/zynq7000-hal/LICENSE-APACHE b/zynq/zynq7000-hal/LICENSE-APACHE
similarity index 100%
rename from zynq7000-hal/LICENSE-APACHE
rename to zynq/zynq7000-hal/LICENSE-APACHE
diff --git a/zynq7000-hal/LICENSE-MIT b/zynq/zynq7000-hal/LICENSE-MIT
similarity index 100%
rename from zynq7000-hal/LICENSE-MIT
rename to zynq/zynq7000-hal/LICENSE-MIT
diff --git a/zynq7000-hal/README.md b/zynq/zynq7000-hal/README.md
similarity index 100%
rename from zynq7000-hal/README.md
rename to zynq/zynq7000-hal/README.md
diff --git a/zynq7000-hal/docs.sh b/zynq/zynq7000-hal/docs.sh
similarity index 100%
rename from zynq7000-hal/docs.sh
rename to zynq/zynq7000-hal/docs.sh
diff --git a/zynq7000-hal/src/cache.rs b/zynq/zynq7000-hal/src/cache.rs
similarity index 100%
rename from zynq7000-hal/src/cache.rs
rename to zynq/zynq7000-hal/src/cache.rs
diff --git a/zynq7000-hal/src/clocks/mod.rs b/zynq/zynq7000-hal/src/clocks/mod.rs
similarity index 100%
rename from zynq7000-hal/src/clocks/mod.rs
rename to zynq/zynq7000-hal/src/clocks/mod.rs
diff --git a/zynq7000-hal/src/clocks/pll.rs b/zynq/zynq7000-hal/src/clocks/pll.rs
similarity index 100%
rename from zynq7000-hal/src/clocks/pll.rs
rename to zynq/zynq7000-hal/src/clocks/pll.rs
diff --git a/zynq7000-hal/src/ddr/ll.rs b/zynq/zynq7000-hal/src/ddr/ll.rs
similarity index 100%
rename from zynq7000-hal/src/ddr/ll.rs
rename to zynq/zynq7000-hal/src/ddr/ll.rs
diff --git a/zynq7000-hal/src/ddr/mod.rs b/zynq/zynq7000-hal/src/ddr/mod.rs
similarity index 100%
rename from zynq7000-hal/src/ddr/mod.rs
rename to zynq/zynq7000-hal/src/ddr/mod.rs
diff --git a/zynq7000-hal/src/devcfg.rs b/zynq/zynq7000-hal/src/devcfg.rs
similarity index 100%
rename from zynq7000-hal/src/devcfg.rs
rename to zynq/zynq7000-hal/src/devcfg.rs
diff --git a/zynq7000-hal/src/eth/embassy_net.rs b/zynq/zynq7000-hal/src/eth/embassy_net.rs
similarity index 100%
rename from zynq7000-hal/src/eth/embassy_net.rs
rename to zynq/zynq7000-hal/src/eth/embassy_net.rs
diff --git a/zynq7000-hal/src/eth/ll.rs b/zynq/zynq7000-hal/src/eth/ll.rs
similarity index 100%
rename from zynq7000-hal/src/eth/ll.rs
rename to zynq/zynq7000-hal/src/eth/ll.rs
diff --git a/zynq7000-hal/src/eth/mdio.rs b/zynq/zynq7000-hal/src/eth/mdio.rs
similarity index 100%
rename from zynq7000-hal/src/eth/mdio.rs
rename to zynq/zynq7000-hal/src/eth/mdio.rs
diff --git a/zynq7000-hal/src/eth/mod.rs b/zynq/zynq7000-hal/src/eth/mod.rs
similarity index 100%
rename from zynq7000-hal/src/eth/mod.rs
rename to zynq/zynq7000-hal/src/eth/mod.rs
diff --git a/zynq7000-hal/src/eth/rx_descr.rs b/zynq/zynq7000-hal/src/eth/rx_descr.rs
similarity index 100%
rename from zynq7000-hal/src/eth/rx_descr.rs
rename to zynq/zynq7000-hal/src/eth/rx_descr.rs
diff --git a/zynq7000-hal/src/eth/smoltcp.rs b/zynq/zynq7000-hal/src/eth/smoltcp.rs
similarity index 100%
rename from zynq7000-hal/src/eth/smoltcp.rs
rename to zynq/zynq7000-hal/src/eth/smoltcp.rs
diff --git a/zynq7000-hal/src/eth/tx_descr.rs b/zynq/zynq7000-hal/src/eth/tx_descr.rs
similarity index 100%
rename from zynq7000-hal/src/eth/tx_descr.rs
rename to zynq/zynq7000-hal/src/eth/tx_descr.rs
diff --git a/zynq7000-hal/src/gic.rs b/zynq/zynq7000-hal/src/gic.rs
similarity index 100%
rename from zynq7000-hal/src/gic.rs
rename to zynq/zynq7000-hal/src/gic.rs
diff --git a/zynq7000-hal/src/gpio/emio.rs b/zynq/zynq7000-hal/src/gpio/emio.rs
similarity index 100%
rename from zynq7000-hal/src/gpio/emio.rs
rename to zynq/zynq7000-hal/src/gpio/emio.rs
diff --git a/zynq7000-hal/src/gpio/ll.rs b/zynq/zynq7000-hal/src/gpio/ll.rs
similarity index 100%
rename from zynq7000-hal/src/gpio/ll.rs
rename to zynq/zynq7000-hal/src/gpio/ll.rs
diff --git a/zynq7000-hal/src/gpio/mio.rs b/zynq/zynq7000-hal/src/gpio/mio.rs
similarity index 100%
rename from zynq7000-hal/src/gpio/mio.rs
rename to zynq/zynq7000-hal/src/gpio/mio.rs
diff --git a/zynq7000-hal/src/gpio/mod.rs b/zynq/zynq7000-hal/src/gpio/mod.rs
similarity index 100%
rename from zynq7000-hal/src/gpio/mod.rs
rename to zynq/zynq7000-hal/src/gpio/mod.rs
diff --git a/zynq7000-hal/src/gtc.rs b/zynq/zynq7000-hal/src/gtc.rs
similarity index 100%
rename from zynq7000-hal/src/gtc.rs
rename to zynq/zynq7000-hal/src/gtc.rs
diff --git a/zynq7000-hal/src/i2c.rs b/zynq/zynq7000-hal/src/i2c.rs
similarity index 100%
rename from zynq7000-hal/src/i2c.rs
rename to zynq/zynq7000-hal/src/i2c.rs
diff --git a/zynq7000-hal/src/l2_cache.rs b/zynq/zynq7000-hal/src/l2_cache.rs
similarity index 100%
rename from zynq7000-hal/src/l2_cache.rs
rename to zynq/zynq7000-hal/src/l2_cache.rs
diff --git a/zynq7000-hal/src/lib.rs b/zynq/zynq7000-hal/src/lib.rs
similarity index 100%
rename from zynq7000-hal/src/lib.rs
rename to zynq/zynq7000-hal/src/lib.rs
diff --git a/zynq7000-hal/src/log.rs b/zynq/zynq7000-hal/src/log.rs
similarity index 100%
rename from zynq7000-hal/src/log.rs
rename to zynq/zynq7000-hal/src/log.rs
diff --git a/zynq7000-hal/src/prelude.rs b/zynq/zynq7000-hal/src/prelude.rs
similarity index 100%
rename from zynq7000-hal/src/prelude.rs
rename to zynq/zynq7000-hal/src/prelude.rs
diff --git a/zynq7000-hal/src/priv_tim.rs b/zynq/zynq7000-hal/src/priv_tim.rs
similarity index 100%
rename from zynq7000-hal/src/priv_tim.rs
rename to zynq/zynq7000-hal/src/priv_tim.rs
diff --git a/zynq7000-hal/src/qspi/lqspi_configs.rs b/zynq/zynq7000-hal/src/qspi/lqspi_configs.rs
similarity index 100%
rename from zynq7000-hal/src/qspi/lqspi_configs.rs
rename to zynq/zynq7000-hal/src/qspi/lqspi_configs.rs
diff --git a/zynq7000-hal/src/qspi/mod.rs b/zynq/zynq7000-hal/src/qspi/mod.rs
similarity index 100%
rename from zynq7000-hal/src/qspi/mod.rs
rename to zynq/zynq7000-hal/src/qspi/mod.rs
diff --git a/zynq7000-hal/src/slcr.rs b/zynq/zynq7000-hal/src/slcr.rs
similarity index 100%
rename from zynq7000-hal/src/slcr.rs
rename to zynq/zynq7000-hal/src/slcr.rs
diff --git a/zynq7000-hal/src/spi/asynch.rs b/zynq/zynq7000-hal/src/spi/asynch.rs
similarity index 100%
rename from zynq7000-hal/src/spi/asynch.rs
rename to zynq/zynq7000-hal/src/spi/asynch.rs
diff --git a/zynq7000-hal/src/spi/mod.rs b/zynq/zynq7000-hal/src/spi/mod.rs
similarity index 100%
rename from zynq7000-hal/src/spi/mod.rs
rename to zynq/zynq7000-hal/src/spi/mod.rs
diff --git a/zynq7000-hal/src/time.rs b/zynq/zynq7000-hal/src/time.rs
similarity index 100%
rename from zynq7000-hal/src/time.rs
rename to zynq/zynq7000-hal/src/time.rs
diff --git a/zynq7000-hal/src/ttc.rs b/zynq/zynq7000-hal/src/ttc.rs
similarity index 100%
rename from zynq7000-hal/src/ttc.rs
rename to zynq/zynq7000-hal/src/ttc.rs
diff --git a/zynq7000-hal/src/uart/mod.rs b/zynq/zynq7000-hal/src/uart/mod.rs
similarity index 100%
rename from zynq7000-hal/src/uart/mod.rs
rename to zynq/zynq7000-hal/src/uart/mod.rs
diff --git a/zynq7000-hal/src/uart/rx.rs b/zynq/zynq7000-hal/src/uart/rx.rs
similarity index 100%
rename from zynq7000-hal/src/uart/rx.rs
rename to zynq/zynq7000-hal/src/uart/rx.rs
diff --git a/zynq7000-hal/src/uart/tx.rs b/zynq/zynq7000-hal/src/uart/tx.rs
similarity index 100%
rename from zynq7000-hal/src/uart/tx.rs
rename to zynq/zynq7000-hal/src/uart/tx.rs
diff --git a/zynq7000-hal/src/uart/tx_async.rs b/zynq/zynq7000-hal/src/uart/tx_async.rs
similarity index 100%
rename from zynq7000-hal/src/uart/tx_async.rs
rename to zynq/zynq7000-hal/src/uart/tx_async.rs
diff --git a/zynq7000-mmu/Cargo.toml b/zynq/zynq7000-mmu/Cargo.toml
similarity index 100%
rename from zynq7000-mmu/Cargo.toml
rename to zynq/zynq7000-mmu/Cargo.toml
diff --git a/zynq7000-mmu/src/lib.rs b/zynq/zynq7000-mmu/src/lib.rs
similarity index 100%
rename from zynq7000-mmu/src/lib.rs
rename to zynq/zynq7000-mmu/src/lib.rs
diff --git a/zynq7000-rt/Cargo.toml b/zynq/zynq7000-rt/Cargo.toml
similarity index 100%
rename from zynq7000-rt/Cargo.toml
rename to zynq/zynq7000-rt/Cargo.toml
diff --git a/zynq7000-rt/README.md b/zynq/zynq7000-rt/README.md
similarity index 100%
rename from zynq7000-rt/README.md
rename to zynq/zynq7000-rt/README.md
diff --git a/zynq7000-rt/docs.sh b/zynq/zynq7000-rt/docs.sh
similarity index 100%
rename from zynq7000-rt/docs.sh
rename to zynq/zynq7000-rt/docs.sh
diff --git a/zynq7000-rt/regen-table.sh b/zynq/zynq7000-rt/regen-table.sh
similarity index 100%
rename from zynq7000-rt/regen-table.sh
rename to zynq/zynq7000-rt/regen-table.sh
diff --git a/zynq7000-rt/src/bin/table-gen.rs b/zynq/zynq7000-rt/src/bin/table-gen.rs
similarity index 100%
rename from zynq7000-rt/src/bin/table-gen.rs
rename to zynq/zynq7000-rt/src/bin/table-gen.rs
diff --git a/zynq7000-rt/src/lib.rs b/zynq/zynq7000-rt/src/lib.rs
similarity index 100%
rename from zynq7000-rt/src/lib.rs
rename to zynq/zynq7000-rt/src/lib.rs
diff --git a/zynq7000-rt/src/mmu.rs b/zynq/zynq7000-rt/src/mmu.rs
similarity index 100%
rename from zynq7000-rt/src/mmu.rs
rename to zynq/zynq7000-rt/src/mmu.rs
diff --git a/zynq7000-rt/src/mmu_table.rs b/zynq/zynq7000-rt/src/mmu_table.rs
similarity index 100%
rename from zynq7000-rt/src/mmu_table.rs
rename to zynq/zynq7000-rt/src/mmu_table.rs
diff --git a/zynq7000-rt/src/rt.rs b/zynq/zynq7000-rt/src/rt.rs
similarity index 100%
rename from zynq7000-rt/src/rt.rs
rename to zynq/zynq7000-rt/src/rt.rs
diff --git a/zynq7000/Cargo.toml b/zynq/zynq7000/Cargo.toml
similarity index 100%
rename from zynq7000/Cargo.toml
rename to zynq/zynq7000/Cargo.toml
diff --git a/zynq7000/LICENSE-APACHE b/zynq/zynq7000/LICENSE-APACHE
similarity index 100%
rename from zynq7000/LICENSE-APACHE
rename to zynq/zynq7000/LICENSE-APACHE
diff --git a/zynq7000/LICENSE-MIT b/zynq/zynq7000/LICENSE-MIT
similarity index 100%
rename from zynq7000/LICENSE-MIT
rename to zynq/zynq7000/LICENSE-MIT
diff --git a/zynq7000/README.md b/zynq/zynq7000/README.md
similarity index 100%
rename from zynq7000/README.md
rename to zynq/zynq7000/README.md
diff --git a/zynq7000/build.rs b/zynq/zynq7000/build.rs
similarity index 100%
rename from zynq7000/build.rs
rename to zynq/zynq7000/build.rs
diff --git a/zynq7000/docs.sh b/zynq/zynq7000/docs.sh
similarity index 100%
rename from zynq7000/docs.sh
rename to zynq/zynq7000/docs.sh
diff --git a/zynq7000/src/ddrc.rs b/zynq/zynq7000/src/ddrc.rs
similarity index 100%
rename from zynq7000/src/ddrc.rs
rename to zynq/zynq7000/src/ddrc.rs
diff --git a/zynq7000/src/devcfg.rs b/zynq/zynq7000/src/devcfg.rs
similarity index 100%
rename from zynq7000/src/devcfg.rs
rename to zynq/zynq7000/src/devcfg.rs
diff --git a/zynq7000/src/eth.rs b/zynq/zynq7000/src/eth.rs
similarity index 100%
rename from zynq7000/src/eth.rs
rename to zynq/zynq7000/src/eth.rs
diff --git a/zynq7000/src/gic.rs b/zynq/zynq7000/src/gic.rs
similarity index 100%
rename from zynq7000/src/gic.rs
rename to zynq/zynq7000/src/gic.rs
diff --git a/zynq7000/src/gpio.rs b/zynq/zynq7000/src/gpio.rs
similarity index 100%
rename from zynq7000/src/gpio.rs
rename to zynq/zynq7000/src/gpio.rs
diff --git a/zynq7000/src/gtc.rs b/zynq/zynq7000/src/gtc.rs
similarity index 100%
rename from zynq7000/src/gtc.rs
rename to zynq/zynq7000/src/gtc.rs
diff --git a/zynq7000/src/i2c.rs b/zynq/zynq7000/src/i2c.rs
similarity index 100%
rename from zynq7000/src/i2c.rs
rename to zynq/zynq7000/src/i2c.rs
diff --git a/zynq7000/src/l2_cache.rs b/zynq/zynq7000/src/l2_cache.rs
similarity index 100%
rename from zynq7000/src/l2_cache.rs
rename to zynq/zynq7000/src/l2_cache.rs
diff --git a/zynq7000/src/lib.rs b/zynq/zynq7000/src/lib.rs
similarity index 100%
rename from zynq7000/src/lib.rs
rename to zynq/zynq7000/src/lib.rs
diff --git a/zynq7000/src/mpcore.rs b/zynq/zynq7000/src/mpcore.rs
similarity index 100%
rename from zynq7000/src/mpcore.rs
rename to zynq/zynq7000/src/mpcore.rs
diff --git a/zynq7000/src/priv_tim.rs b/zynq/zynq7000/src/priv_tim.rs
similarity index 100%
rename from zynq7000/src/priv_tim.rs
rename to zynq/zynq7000/src/priv_tim.rs
diff --git a/zynq7000/src/qspi.rs b/zynq/zynq7000/src/qspi.rs
similarity index 100%
rename from zynq7000/src/qspi.rs
rename to zynq/zynq7000/src/qspi.rs
diff --git a/zynq7000/src/slcr/clocks.rs b/zynq/zynq7000/src/slcr/clocks.rs
similarity index 100%
rename from zynq7000/src/slcr/clocks.rs
rename to zynq/zynq7000/src/slcr/clocks.rs
diff --git a/zynq7000/src/slcr/ddriob.rs b/zynq/zynq7000/src/slcr/ddriob.rs
similarity index 100%
rename from zynq7000/src/slcr/ddriob.rs
rename to zynq/zynq7000/src/slcr/ddriob.rs
diff --git a/zynq7000/src/slcr/mio.rs b/zynq/zynq7000/src/slcr/mio.rs
similarity index 100%
rename from zynq7000/src/slcr/mio.rs
rename to zynq/zynq7000/src/slcr/mio.rs
diff --git a/zynq7000/src/slcr/mod.rs b/zynq/zynq7000/src/slcr/mod.rs
similarity index 100%
rename from zynq7000/src/slcr/mod.rs
rename to zynq/zynq7000/src/slcr/mod.rs
diff --git a/zynq7000/src/slcr/reset.rs b/zynq/zynq7000/src/slcr/reset.rs
similarity index 100%
rename from zynq7000/src/slcr/reset.rs
rename to zynq/zynq7000/src/slcr/reset.rs
diff --git a/zynq7000/src/spi.rs b/zynq/zynq7000/src/spi.rs
similarity index 100%
rename from zynq7000/src/spi.rs
rename to zynq/zynq7000/src/spi.rs
diff --git a/zynq7000/src/ttc.rs b/zynq/zynq7000/src/ttc.rs
similarity index 100%
rename from zynq7000/src/ttc.rs
rename to zynq/zynq7000/src/ttc.rs
diff --git a/zynq7000/src/uart.rs b/zynq/zynq7000/src/uart.rs
similarity index 100%
rename from zynq7000/src/uart.rs
rename to zynq/zynq7000/src/uart.rs
diff --git a/zynq7000/src/xadc.rs b/zynq/zynq7000/src/xadc.rs
similarity index 100%
rename from zynq7000/src/xadc.rs
rename to zynq/zynq7000/src/xadc.rs
diff --git a/zynq7000-boot-image/.gitignore b/zynq7000-boot-image/.gitignore
new file mode 100644
index 0000000..5a44eef
--- /dev/null
+++ b/zynq7000-boot-image/.gitignore
@@ -0,0 +1 @@
+/Cargo.lock
diff --git a/zynq7000-ps7init-extract/src/main.rs b/zynq7000-ps7init-extract/src/main.rs
deleted file mode 100644
index e7a11a9..0000000
--- a/zynq7000-ps7init-extract/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    println!("Hello, world!");
-}
diff --git a/zynq7000-rt/Cargo.lock b/zynq7000-rt/Cargo.lock
deleted file mode 100644
index d536135..0000000
--- a/zynq7000-rt/Cargo.lock
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "zynq-rt"
-version = "0.1.0"