From cb78435904075b84c9a25c31c46dbcd7e88c58d1 Mon Sep 17 00:00:00 2001 From: Jonathan Pallant Date: Tue, 23 Jul 2024 17:19:14 +0100 Subject: [PATCH] Complying with the REUSE specification --- qemu-cortex-r5-app/.cargo/config.toml | 3 +++ qemu-cortex-r5-app/.gitignore | 3 +++ qemu-cortex-r5-app/.vscode/settings.json | 3 --- qemu-cortex-r5-app/Cargo.lock.license | 2 ++ qemu-cortex-r5-app/Cargo.toml | 3 +++ qemu-cortex-r5-app/commands.gdb.license | 2 ++ qemu-cortex-r5-app/linker.ld | 7 +++++++ qemu-cortex-r5-app/src/lib.rs | 5 +++++ qemu-cortex-r5-app/src/pl011_uart.rs | 7 +++---- qemu-cortex-r5-app/src/pl190_vic.rs | 7 +++---- qemu-cortex-r5-app/src/sp804_timer.rs | 8 ++++---- 11 files changed, 35 insertions(+), 15 deletions(-) delete mode 100644 qemu-cortex-r5-app/.vscode/settings.json create mode 100644 qemu-cortex-r5-app/Cargo.lock.license create mode 100644 qemu-cortex-r5-app/commands.gdb.license diff --git a/qemu-cortex-r5-app/.cargo/config.toml b/qemu-cortex-r5-app/.cargo/config.toml index fa7148c..29a7196 100644 --- a/qemu-cortex-r5-app/.cargo/config.toml +++ b/qemu-cortex-r5-app/.cargo/config.toml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +# SPDX-License-Identifier: MIT OR Apache-2.0 + [target.armv7r-none-eabihf] rustflags = [ "-Clink-arg=-Tlinker.ld", diff --git a/qemu-cortex-r5-app/.gitignore b/qemu-cortex-r5-app/.gitignore index ea8c4bf..a0c89ad 100644 --- a/qemu-cortex-r5-app/.gitignore +++ b/qemu-cortex-r5-app/.gitignore @@ -1 +1,4 @@ +# SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +# SPDX-License-Identifier: CC0-1.0 + /target diff --git a/qemu-cortex-r5-app/.vscode/settings.json b/qemu-cortex-r5-app/.vscode/settings.json deleted file mode 100644 index 7d7a538..0000000 --- a/qemu-cortex-r5-app/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "rust-analyzer.procMacro.enable": false -} diff --git a/qemu-cortex-r5-app/Cargo.lock.license b/qemu-cortex-r5-app/Cargo.lock.license new file mode 100644 index 0000000..16e4e62 --- /dev/null +++ b/qemu-cortex-r5-app/Cargo.lock.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +# SPDX-License-Identifier: CC0-1.0 diff --git a/qemu-cortex-r5-app/Cargo.toml b/qemu-cortex-r5-app/Cargo.toml index 0b5d601..766c864 100644 --- a/qemu-cortex-r5-app/Cargo.toml +++ b/qemu-cortex-r5-app/Cargo.toml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +# SPDX-License-Identifier: MIT OR Apache-2.0 + [package] name = "qemu-cortex-r5-app" version = "0.1.0" diff --git a/qemu-cortex-r5-app/commands.gdb.license b/qemu-cortex-r5-app/commands.gdb.license new file mode 100644 index 0000000..16e4e62 --- /dev/null +++ b/qemu-cortex-r5-app/commands.gdb.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +# SPDX-License-Identifier: CC0-1.0 diff --git a/qemu-cortex-r5-app/linker.ld b/qemu-cortex-r5-app/linker.ld index bc03eaa..f7fa5ac 100644 --- a/qemu-cortex-r5-app/linker.ld +++ b/qemu-cortex-r5-app/linker.ld @@ -1,3 +1,10 @@ +/* + * Linker script for running ThreadX/Rust on QEMU's Versatile AB with a Cortex-R5 + * + * SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems + * SPDX-License-Identifier: MIT OR Apache-2.0 +*/ + MEMORY { RAM : ORIGIN = 0, LENGTH = 0x1000000 } diff --git a/qemu-cortex-r5-app/src/lib.rs b/qemu-cortex-r5-app/src/lib.rs index 5298199..4bccf1c 100644 --- a/qemu-cortex-r5-app/src/lib.rs +++ b/qemu-cortex-r5-app/src/lib.rs @@ -1,3 +1,8 @@ +//! Common code for the ThreadX/Rust on Cortex-R5 demo + +// SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +// SPDX-License-Identifier: MIT OR Apache-2.0 + #![no_std] pub mod pl011_uart; diff --git a/qemu-cortex-r5-app/src/pl011_uart.rs b/qemu-cortex-r5-app/src/pl011_uart.rs index be3f1a6..1ef09f6 100644 --- a/qemu-cortex-r5-app/src/pl011_uart.rs +++ b/qemu-cortex-r5-app/src/pl011_uart.rs @@ -1,8 +1,7 @@ //! Code for the Arm PL011 Uart -//! -//! Written by Jonathan Pallant at Ferrous Systems -//! -//! Copyright (c) Ferrous Systems, 2024 + +// SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +// SPDX-License-Identifier: MIT OR Apache-2.0 /// A driver for a virtual PL011 Uart /// diff --git a/qemu-cortex-r5-app/src/pl190_vic.rs b/qemu-cortex-r5-app/src/pl190_vic.rs index 13f60c7..b05d8f0 100644 --- a/qemu-cortex-r5-app/src/pl190_vic.rs +++ b/qemu-cortex-r5-app/src/pl190_vic.rs @@ -1,8 +1,7 @@ //! Code for the Arm PL190 Vector Interrupt Controller -//! -//! Written by Jonathan Pallant at Ferrous Systems -//! -//! Copyright (c) Ferrous Systems, 2024 + +// SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +// SPDX-License-Identifier: MIT OR Apache-2.0 /// A driver for a virtual PL190 Vector Interrupt Controller /// diff --git a/qemu-cortex-r5-app/src/sp804_timer.rs b/qemu-cortex-r5-app/src/sp804_timer.rs index 6d08826..9ea4d3c 100644 --- a/qemu-cortex-r5-app/src/sp804_timer.rs +++ b/qemu-cortex-r5-app/src/sp804_timer.rs @@ -1,8 +1,7 @@ //! Code for the Arm SP804 Timer -//! -//! Written by Jonathan Pallant at Ferrous Systems -//! -//! Copyright (c) Ferrous Systems, 2024 + +// SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems +// SPDX-License-Identifier: MIT OR Apache-2.0 /// Supported timer modes pub enum Mode { @@ -16,6 +15,7 @@ pub enum Interrupts { Enabled = 1 << 5, } +/// Timer0 on an Arm Versatile Application Board. pub type Timer0 = Timer<0x101e_2000>; /// A driver for a virtual SP804 Timer