7 Commits

Author SHA1 Message Date
Robin Mueller
c7f8aa8657 missing changelog entries
Some checks failed
ci / Check build (push) Has been cancelled
ci / Check formatting (push) Has been cancelled
ci / Check Documentation Build (push) Has been cancelled
ci / Clippy (push) Has been cancelled
2025-10-09 11:09:24 +02:00
Robin Mueller
9596cf4dae prep patch releases
Some checks failed
ci / Check build (push) Has been cancelled
ci / Check formatting (push) Has been cancelled
ci / Check Documentation Build (push) Has been cancelled
ci / Clippy (push) Has been cancelled
2025-10-09 11:07:46 +02:00
0fa69f9eb9 Merge pull request 'only compile arch specific code for cortex-a' (#17) from target-cfg-cortex-a-low-level-crates into main
Some checks failed
ci / Check build (push) Has been cancelled
ci / Check formatting (push) Has been cancelled
ci / Check Documentation Build (push) Has been cancelled
ci / Clippy (push) Has been cancelled
Reviewed-on: #17
2025-10-09 11:01:47 +02:00
Robin Mueller
687be0e515 only compile arch specific code for cortex-a
Some checks failed
ci / Check build (push) Has been cancelled
ci / Check formatting (push) Has been cancelled
ci / Check Documentation Build (push) Has been cancelled
ci / Clippy (push) Has been cancelled
ci / Check build (pull_request) Has been cancelled
ci / Check formatting (pull_request) Has been cancelled
ci / Check Documentation Build (pull_request) Has been cancelled
ci / Clippy (pull_request) Has been cancelled
2025-10-09 10:58:42 +02:00
4e2da0a790 Merge pull request 'smaller tweaks and docs API unification' (#16) from smaller-updates into main
Some checks failed
ci / Check build (push) Has been cancelled
ci / Check formatting (push) Has been cancelled
ci / Check Documentation Build (push) Has been cancelled
ci / Clippy (push) Has been cancelled
Reviewed-on: #16
2025-10-09 10:58:17 +02:00
Robin Mueller
0206d15b2e smaller tweaks and docs API unification
Some checks failed
ci / Check build (pull_request) Has been cancelled
ci / Check formatting (pull_request) Has been cancelled
ci / Check Documentation Build (pull_request) Has been cancelled
ci / Clippy (pull_request) Has been cancelled
ci / Check build (push) Has been cancelled
ci / Check formatting (push) Has been cancelled
ci / Check Documentation Build (push) Has been cancelled
ci / Clippy (push) Has been cancelled
2025-10-09 10:58:01 +02:00
Robin Mueller
98aedf2249 another small typo
Some checks failed
ci / Check build (push) Has been cancelled
ci / Check formatting (push) Has been cancelled
ci / Check Documentation Build (push) Has been cancelled
ci / Clippy (push) Has been cancelled
2025-10-09 00:51:25 +02:00
33 changed files with 77 additions and 24 deletions

4
.gitignore vendored
View File

@@ -1,7 +1,7 @@
target
xsct-output.log
app.map
/app.map
/xsct-output.log
/.vscode
/Cargo.lock
/.cargo/config.toml

View File

@@ -111,7 +111,8 @@ target = "armv7a-none-eabihf"
You can build the blinky example app using
```sh
cargo build --example simple
cd zynq
cargo build --bin blinky
```

View File

@@ -1,7 +1,7 @@
#![doc = r"This file was auto-generated by the [zynq7000-ps7init-extract](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/tools/zynq7000-ps7init-extract) program."]
#![doc = r""]
#![doc = r"This configuration file contains static DDR configuration parameters extracted from the"]
#![doc = r"AMD ps7init.tcl file"]
#![doc = r"AMD ps7init.tcl file. It was generated for the MT41K128M16JT-125 DDR chip."]
use zynq7000::ddrc::regs;
use zynq7000_hal::ddr::DdrcConfigSet;
pub const DDRC_CONFIG_ZEDBOARD: DdrcConfigSet = DdrcConfigSet {

View File

@@ -1,7 +1,7 @@
#![doc = r"This file was auto-generated by the [zynq7000-ps7init-extract](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/tools/zynq7000-ps7init-extract) program."]
#![doc = r""]
#![doc = r"This configuration file contains static DDRIOB configuration parameters extracted from the"]
#![doc = r"AMD ps7init.tcl file"]
#![doc = r"AMD ps7init.tcl file. It was generated for the MT41K128M16JT-125 DDR chip."]
use zynq7000::ddrc::regs;
use zynq7000_hal::ddr::DdriobConfigSet;
pub const DDRIOB_CONFIG_SET_ZEDBOARD: DdriobConfigSet = DdriobConfigSet {

View File

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
# [unreleased]
# [v0.1.0] 2025-10-08
# [v0.1.0] 2025-10-09
Initial release

View File

@@ -8,9 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
# [unreleased]
# [v0.1.1] 2025-10-10
Documentation fixes.
# [v0.1.0] 2025-10-09
Initial release
[unreleased]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/compare/zynq7000-hal-v0.1.0...HEAD
[v0.1.1]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/tag/zynq7000-hal-v0.1.0...zynq7000-hal-v0.1.1
[v0.1.0]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/tag/zynq7000-hal-v0.1.0

View File

@@ -1,6 +1,6 @@
[package]
name = "zynq7000-hal"
version = "0.1.0"
version = "0.1.1"
authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
edition = "2024"
description = "Hardware Abstraction Layer (HAL) for the Zynq7000 family of SoCs"
@@ -52,4 +52,6 @@ approx = "0.5"
[package.metadata.docs.rs]
features = ["alloc"]
targets = ["armv7a-none-eabihf"]
cargo-args = ["-Z", "build-std=core"]
rustdoc-args = ["--generate-link-to-definition"]

View File

@@ -8,9 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
# [unreleased]
# [v0.1.1] 2025-10-10
Documentation fixes.
# [v0.1.0] 2025-10-09
Initial release
[unreleased]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/compare/zynq7000-mmu-v0.1.0...HEAD
[v0.1.1]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/tag/zynq7000-mmu-v0.1.0...zynq7000-mmu-v0.1.1
[v0.1.0]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/tag/zynq7000-mmu-v0.1.0

View File

@@ -1,7 +1,7 @@
[package]
name = "zynq7000-mmu"
description = "Zynq7000 MMU structures"
version = "0.1.0"
version = "0.1.1"
edition = "2024"
license = "MIT OR Apache-2.0"
homepage = "https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs"
@@ -13,5 +13,13 @@ categories = ["embedded", "no-std", "hardware-support"]
thiserror = { version = "2", default-features = false }
cortex-ar = { version = "0.3" }
[build-dependencies]
arm-targets = { version = "0.3" }
[features]
tools = []
[package.metadata.docs.rs]
targets = ["armv7a-none-eabihf"]
cargo-args = ["-Z", "build-std=core"]
rustdoc-args = ["--generate-link-to-definition"]

View File

@@ -1,3 +1,7 @@
[![Crates.io](https://img.shields.io/crates/v/zynq7000-mmu)](https://crates.io/crates/zynq7000-mmu)
[![docs.rs](https://img.shields.io/docsrs/zynq7000-mmu)](https://docs.rs/zynq7000-mmu)
[![ci](https://github.com/us-irs/zynq7000-rs/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/us-irs/zynq7000-rs/actions/workflows/ci.yml)
Zynq7000 Memory Management Unit (MMU) library
=========

View File

@@ -0,0 +1,3 @@
fn main() {
arm_targets::process();
}

View File

@@ -1,4 +1,4 @@
//! # Zynq7000 Memory Management Unit (MMU)
//! # Zynq7000 Memory Management Unit (MMU)
//!
//! Dedicated shared crate for Zynq7000 MMU abstractions which can be used by Zynq
//! runtime crates, PACs and HALs.
@@ -7,7 +7,7 @@
use core::cell::UnsafeCell;
use cortex_ar::mmu::L1Section;
#[cfg(not(feature = "tools"))]
#[cfg(all(not(feature = "tools"), arm_profile = "a"))]
use cortex_ar::{
asm::{dsb, isb},
cache::clean_and_invalidate_l1_data_cache,
@@ -39,7 +39,7 @@ impl L1TableRaw {
self.0.as_mut_ptr() as *mut _
}
#[cfg(not(feature = "tools"))]
#[cfg(all(not(feature = "tools"), arm_profile = "a"))]
pub fn update(
&mut self,
addr: u32,
@@ -92,7 +92,7 @@ impl<'a> L1TableWrapper<'a> {
}
impl L1TableWrapper<'_> {
#[cfg(not(feature = "tools"))]
#[cfg(all(not(feature = "tools"), arm_profile = "a"))]
pub fn update(
&mut self,
addr: u32,

View File

@@ -8,9 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
# [unreleased]
# [v0.1.1] 2025-10-10
Documentation fixes.
# [v0.1.0] 2025-10-09
Initial release
[unreleased]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/compare/zynq7000-rt-v0.1.0...HEAD
[v0.1.1]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/tag/zynq7000-rt-v0.1.0...zynq7000-rt-v0.1.1
[v0.1.0]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/tag/zynq7000-rt-v0.1.0

View File

@@ -1,6 +1,6 @@
[package]
name = "zynq7000-rt"
version = "0.1.0"
version = "0.1.1"
authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
edition = "2024"
description = "Run-time support for the Zynq7000 family of SoCs for running bare-metal applications"
@@ -16,9 +16,14 @@ cortex-ar = { version = "0.3" }
arbitrary-int = "2"
zynq7000-mmu = { path = "../zynq7000-mmu", version = "0.1" }
[build-dependencies]
arm-targets = { version = "0.3" }
[features]
default = ["rt"]
rt = ["dep:cortex-a-rt"]
[package.metadata.docs.rs]
targets = ["armv7a-none-eabihf"]
cargo-args = ["-Z", "build-std=core"]
rustdoc-args = ["--generate-link-to-definition"]

View File

@@ -0,0 +1,3 @@
fn main() {
arm_targets::process();
}

View File

@@ -9,20 +9,20 @@
//! - Modification to the stack setup code, because a different linker script is used.
#![no_std]
#![cfg_attr(docsrs, feature(doc_cfg))]
#[cfg(feature = "rt")]
#[cfg(all(feature = "rt", arm_profile = "a"))]
pub use cortex_a_rt::*;
#[cfg(feature = "rt")]
use zynq7000_mmu::L1TableWrapper;
pub mod mmu;
#[cfg(feature = "rt")]
#[cfg(all(feature = "rt", arm_profile = "a"))]
mod mmu_table;
#[cfg(feature = "rt")]
#[cfg(all(feature = "rt", arm_profile = "a"))]
pub mod rt;
/// Retrieves a mutable reference to the MMU L1 page table.
#[cfg(feature = "rt")]
#[cfg(all(feature = "rt", arm_profile = "a"))]
pub fn mmu_l1_table_mut() -> L1TableWrapper<'static> {
let mmu_table = mmu_table::MMU_L1_PAGE_TABLE.0.get();
// Safety: We retrieve a reference to the MMU page table singleton.

View File

@@ -17,5 +17,5 @@ Documentation fix
Initial release
[unreleased]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/compare/zynq7000-v0.1.1...HEAD
[v0.1.1]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/compare/zynq7000-v0.1.0...zynq7000-0.1.1
[v0.1.1]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/compare/zynq7000-v0.1.0...zynq7000-v0.1.1
[v0.1.0]: https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/tag/zynq7000-v0.1.0

View File

@@ -23,4 +23,6 @@ once_cell = { version = "1", default-features = false, features = ["critical-sec
approx = "0.5"
[package.metadata.docs.rs]
targets = ["armv7a-none-eabihf"]
cargo-args = ["-Z", "build-std=core"]
rustdoc-args = ["--generate-link-to-definition"]

View File

@@ -725,6 +725,7 @@ pub mod regs {
use regs::*;
/// DDR controller register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct DdrController {

View File

@@ -257,6 +257,7 @@ pub struct Status {
efuse_jtag_disabled: bool,
}
/// Device configuration register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct DevCfg {

View File

@@ -418,7 +418,7 @@ pub struct MatchRegister {
type_id: u16,
}
/// Gigabit Ethernet Controller (GEM) registers for Zynq-7000
/// Gigabit Ethernet Controller (GEM) register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct Ethernet {
@@ -477,7 +477,7 @@ pub struct Ethernet {
static_assertions::const_assert_eq!(core::mem::size_of::<Ethernet>(), 0x294);
/// GEM statistics registers
/// Ethernet statistics registers
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct Statistics {

View File

@@ -35,6 +35,7 @@ pub struct BankControl {
int_any: u32,
}
/// GPIO register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct Gpio {

View File

@@ -22,7 +22,7 @@ pub struct InterruptStatus {
event_flag: bool,
}
/// Global timer counter.
/// Global timer counter register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct GlobalTimerCounter {

View File

@@ -156,6 +156,7 @@ pub struct TransferSize {
size: u8,
}
/// I2C register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct I2c {

View File

@@ -184,6 +184,7 @@ pub struct InterruptControl {
event_counter_overflow_increment: bool,
}
/// L2 Cache register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct L2Cache {

View File

@@ -44,6 +44,7 @@ impl SnoopControlUnit {
const_assert_eq!(core::mem::size_of::<SnoopControlUnit>(), 0x58);
/// MP Core register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct MpCore {

View File

@@ -21,6 +21,7 @@ pub struct InterruptStatus {
event_flag: bool,
}
/// CPU private timer register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct CpuPrivateTimer {

View File

@@ -220,6 +220,7 @@ pub struct LinearQspiStatus {
axi_write_command_received: bool,
}
/// QSPI register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct Qspi {

View File

@@ -91,7 +91,7 @@ pub struct LevelShifterRegister {
user_lvl_shftr_en: Option<LevelShifterConfig>,
}
/// System Level Control Registers
/// System Level Control Registers access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct Slcr {

View File

@@ -178,7 +178,7 @@ pub struct DelayControl {
cs_to_first_bit: u8,
}
/// Register block specification for both PS SPIs.
/// SPI register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct Spi {

View File

@@ -142,7 +142,7 @@ pub struct EventCount {
count: u16,
}
/// Triple-timer counter
/// Triple-timer counter register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct Ttc {

View File

@@ -278,6 +278,7 @@ impl InterruptStatus {
}
}
/// UART register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct Uart {

View File

@@ -1,5 +1,6 @@
pub const XADC_BASE_ADDR: usize = 0xF8007100;
/// XADC register access.
#[derive(derive_mmio::Mmio)]
#[repr(C)]
pub struct XAdc {