From 54137e8b3857be3a9c8556ea7c0a599d07188d0b Mon Sep 17 00:00:00 2001 From: Andre Richter Date: Mon, 25 Nov 2019 19:54:05 +0100 Subject: [PATCH] Relicense as dual MIT OR Apache-2.0 --- .githooks/pre-commit | 2 +- 01_wait_forever/Makefile | 2 +- 01_wait_forever/src/arch.rs | 2 +- 01_wait_forever/src/arch/aarch64.rs | 2 +- 01_wait_forever/src/arch/aarch64/start.S | 2 +- 01_wait_forever/src/bsp.rs | 2 +- 01_wait_forever/src/bsp/rpi.rs | 2 +- 01_wait_forever/src/bsp/rpi/link.ld | 2 +- 01_wait_forever/src/main.rs | 2 +- 01_wait_forever/src/panic_wait.rs | 2 +- 02_runtime_init/Makefile | 2 +- 02_runtime_init/README.md | 2 +- 02_runtime_init/src/arch.rs | 2 +- 02_runtime_init/src/arch/aarch64.rs | 2 +- 02_runtime_init/src/arch/aarch64/start.S | 2 +- 02_runtime_init/src/bsp.rs | 2 +- 02_runtime_init/src/bsp/rpi.rs | 2 +- 02_runtime_init/src/bsp/rpi/link.ld | 2 +- 02_runtime_init/src/main.rs | 2 +- 02_runtime_init/src/panic_wait.rs | 2 +- 02_runtime_init/src/runtime_init.rs | 2 +- 03_hacky_hello_world/Makefile | 2 +- 03_hacky_hello_world/README.md | 4 +- 03_hacky_hello_world/src/arch.rs | 2 +- 03_hacky_hello_world/src/arch/aarch64.rs | 2 +- 03_hacky_hello_world/src/arch/aarch64/start.S | 2 +- 03_hacky_hello_world/src/bsp.rs | 2 +- 03_hacky_hello_world/src/bsp/rpi.rs | 2 +- 03_hacky_hello_world/src/bsp/rpi/link.ld | 2 +- 03_hacky_hello_world/src/interface.rs | 2 +- 03_hacky_hello_world/src/main.rs | 2 +- 03_hacky_hello_world/src/panic_wait.rs | 2 +- 03_hacky_hello_world/src/print.rs | 2 +- 03_hacky_hello_world/src/runtime_init.rs | 2 +- 04_zero_overhead_abstraction/Makefile | 2 +- 04_zero_overhead_abstraction/README.md | 2 +- 04_zero_overhead_abstraction/src/arch.rs | 2 +- .../src/arch/aarch64.rs | 2 +- 04_zero_overhead_abstraction/src/bsp.rs | 2 +- 04_zero_overhead_abstraction/src/bsp/rpi.rs | 2 +- .../src/bsp/rpi/link.ld | 2 +- 04_zero_overhead_abstraction/src/interface.rs | 2 +- 04_zero_overhead_abstraction/src/main.rs | 2 +- .../src/panic_wait.rs | 2 +- 04_zero_overhead_abstraction/src/print.rs | 2 +- .../src/runtime_init.rs | 2 +- 05_safe_globals/Makefile | 2 +- 05_safe_globals/README.md | 2 +- 05_safe_globals/src/arch.rs | 2 +- 05_safe_globals/src/arch/aarch64.rs | 2 +- 05_safe_globals/src/arch/aarch64/sync.rs | 2 +- 05_safe_globals/src/bsp.rs | 2 +- 05_safe_globals/src/bsp/rpi.rs | 2 +- 05_safe_globals/src/bsp/rpi/link.ld | 2 +- 05_safe_globals/src/interface.rs | 2 +- 05_safe_globals/src/main.rs | 2 +- 05_safe_globals/src/panic_wait.rs | 2 +- 05_safe_globals/src/print.rs | 2 +- 05_safe_globals/src/runtime_init.rs | 2 +- 06_drivers_gpio_uart/Makefile | 2 +- 06_drivers_gpio_uart/README.md | 10 +- 06_drivers_gpio_uart/src/arch.rs | 2 +- 06_drivers_gpio_uart/src/arch/aarch64.rs | 2 +- 06_drivers_gpio_uart/src/arch/aarch64/sync.rs | 2 +- 06_drivers_gpio_uart/src/bsp.rs | 2 +- 06_drivers_gpio_uart/src/bsp/driver.rs | 2 +- 06_drivers_gpio_uart/src/bsp/driver/bcm.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_gpio.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs | 2 +- 06_drivers_gpio_uart/src/bsp/rpi.rs | 2 +- 06_drivers_gpio_uart/src/bsp/rpi/link.ld | 2 +- .../src/bsp/rpi/memory_map.rs | 2 +- 06_drivers_gpio_uart/src/interface.rs | 2 +- 06_drivers_gpio_uart/src/main.rs | 2 +- 06_drivers_gpio_uart/src/panic_wait.rs | 2 +- 06_drivers_gpio_uart/src/print.rs | 2 +- 06_drivers_gpio_uart/src/runtime_init.rs | 2 +- 07_uart_chainloader/Makefile | 2 +- 07_uart_chainloader/README.md | 2 +- 07_uart_chainloader/src/arch.rs | 2 +- 07_uart_chainloader/src/arch/aarch64.rs | 2 +- 07_uart_chainloader/src/arch/aarch64/sync.rs | 2 +- 07_uart_chainloader/src/bsp.rs | 2 +- 07_uart_chainloader/src/bsp/driver.rs | 2 +- 07_uart_chainloader/src/bsp/driver/bcm.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_gpio.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs | 2 +- 07_uart_chainloader/src/bsp/rpi.rs | 2 +- 07_uart_chainloader/src/bsp/rpi/link.ld | 2 +- 07_uart_chainloader/src/bsp/rpi/memory_map.rs | 2 +- 07_uart_chainloader/src/interface.rs | 2 +- 07_uart_chainloader/src/main.rs | 2 +- 07_uart_chainloader/src/panic_wait.rs | 2 +- 07_uart_chainloader/src/print.rs | 2 +- 07_uart_chainloader/src/relocate.rs | 2 +- 07_uart_chainloader/src/runtime_init.rs | 2 +- 08_timestamps/Makefile | 2 +- 08_timestamps/README.md | 4 +- 08_timestamps/src/arch.rs | 2 +- 08_timestamps/src/arch/aarch64.rs | 2 +- 08_timestamps/src/arch/aarch64/sync.rs | 2 +- 08_timestamps/src/arch/aarch64/time.rs | 2 +- 08_timestamps/src/bsp.rs | 2 +- 08_timestamps/src/bsp/driver.rs | 2 +- 08_timestamps/src/bsp/driver/bcm.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_gpio.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs | 2 +- 08_timestamps/src/bsp/rpi.rs | 2 +- 08_timestamps/src/bsp/rpi/link.ld | 2 +- 08_timestamps/src/bsp/rpi/memory_map.rs | 2 +- 08_timestamps/src/interface.rs | 2 +- 08_timestamps/src/main.rs | 2 +- 08_timestamps/src/panic_wait.rs | 2 +- 08_timestamps/src/print.rs | 2 +- 08_timestamps/src/runtime_init.rs | 2 +- 09_hw_debug_JTAG/Makefile | 2 +- 09_hw_debug_JTAG/src/arch.rs | 2 +- 09_hw_debug_JTAG/src/arch/aarch64.rs | 2 +- 09_hw_debug_JTAG/src/arch/aarch64/sync.rs | 2 +- 09_hw_debug_JTAG/src/arch/aarch64/time.rs | 2 +- 09_hw_debug_JTAG/src/bsp.rs | 2 +- 09_hw_debug_JTAG/src/bsp/driver.rs | 2 +- 09_hw_debug_JTAG/src/bsp/driver/bcm.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_gpio.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs | 2 +- 09_hw_debug_JTAG/src/bsp/rpi.rs | 2 +- 09_hw_debug_JTAG/src/bsp/rpi/link.ld | 2 +- 09_hw_debug_JTAG/src/bsp/rpi/memory_map.rs | 2 +- 09_hw_debug_JTAG/src/interface.rs | 2 +- 09_hw_debug_JTAG/src/main.rs | 2 +- 09_hw_debug_JTAG/src/panic_wait.rs | 2 +- 09_hw_debug_JTAG/src/print.rs | 2 +- 09_hw_debug_JTAG/src/runtime_init.rs | 2 +- 10_privilege_level/Makefile | 2 +- 10_privilege_level/README.md | 2 +- 10_privilege_level/src/arch.rs | 2 +- 10_privilege_level/src/arch/aarch64.rs | 2 +- .../src/arch/aarch64/exception.rs | 2 +- 10_privilege_level/src/arch/aarch64/sync.rs | 2 +- 10_privilege_level/src/arch/aarch64/time.rs | 2 +- 10_privilege_level/src/bsp.rs | 2 +- 10_privilege_level/src/bsp/driver.rs | 2 +- 10_privilege_level/src/bsp/driver/bcm.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_gpio.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs | 2 +- 10_privilege_level/src/bsp/rpi.rs | 2 +- 10_privilege_level/src/bsp/rpi/link.ld | 2 +- 10_privilege_level/src/bsp/rpi/memory_map.rs | 2 +- 10_privilege_level/src/interface.rs | 2 +- 10_privilege_level/src/main.rs | 2 +- 10_privilege_level/src/panic_wait.rs | 2 +- 10_privilege_level/src/print.rs | 2 +- 10_privilege_level/src/runtime_init.rs | 2 +- 11_virtual_memory/Makefile | 2 +- 11_virtual_memory/README.md | 6 +- 11_virtual_memory/src/arch.rs | 2 +- 11_virtual_memory/src/arch/aarch64.rs | 2 +- .../src/arch/aarch64/exception.rs | 2 +- 11_virtual_memory/src/arch/aarch64/mmu.rs | 2 +- 11_virtual_memory/src/arch/aarch64/sync.rs | 2 +- 11_virtual_memory/src/arch/aarch64/time.rs | 2 +- 11_virtual_memory/src/bsp.rs | 2 +- 11_virtual_memory/src/bsp/driver.rs | 2 +- 11_virtual_memory/src/bsp/driver/bcm.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_gpio.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs | 2 +- 11_virtual_memory/src/bsp/rpi.rs | 2 +- 11_virtual_memory/src/bsp/rpi/link.ld | 2 +- 11_virtual_memory/src/bsp/rpi/memory_map.rs | 2 +- .../src/bsp/rpi/virt_mem_layout.rs | 2 +- 11_virtual_memory/src/interface.rs | 2 +- 11_virtual_memory/src/main.rs | 2 +- 11_virtual_memory/src/memory.rs | 2 +- 11_virtual_memory/src/panic_wait.rs | 2 +- 11_virtual_memory/src/print.rs | 2 +- 11_virtual_memory/src/runtime_init.rs | 2 +- 12_cpu_exceptions_part1/Makefile | 2 +- 12_cpu_exceptions_part1/README.md | 2 +- 12_cpu_exceptions_part1/src/arch.rs | 2 +- 12_cpu_exceptions_part1/src/arch/aarch64.rs | 2 +- .../src/arch/aarch64/exception.S | 2 +- .../src/arch/aarch64/exception.rs | 2 +- .../src/arch/aarch64/mmu.rs | 2 +- .../src/arch/aarch64/sync.rs | 2 +- .../src/arch/aarch64/time.rs | 2 +- 12_cpu_exceptions_part1/src/bsp.rs | 2 +- 12_cpu_exceptions_part1/src/bsp/driver.rs | 2 +- 12_cpu_exceptions_part1/src/bsp/driver/bcm.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_gpio.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs | 2 +- 12_cpu_exceptions_part1/src/bsp/rpi.rs | 2 +- 12_cpu_exceptions_part1/src/bsp/rpi/link.ld | 2 +- .../src/bsp/rpi/memory_map.rs | 2 +- .../src/bsp/rpi/virt_mem_layout.rs | 2 +- 12_cpu_exceptions_part1/src/interface.rs | 2 +- 12_cpu_exceptions_part1/src/main.rs | 2 +- 12_cpu_exceptions_part1/src/memory.rs | 2 +- 12_cpu_exceptions_part1/src/panic_wait.rs | 2 +- 12_cpu_exceptions_part1/src/print.rs | 2 +- 12_cpu_exceptions_part1/src/runtime_init.rs | 2 +- LICENSE-APACHE | 201 ++++++++++++++++++ LICENSE => LICENSE-MIT | 17 +- README.md | 13 +- X1_JTAG_boot/Makefile | 2 +- X1_JTAG_boot/src/arch.rs | 2 +- X1_JTAG_boot/src/arch/aarch64.rs | 2 +- X1_JTAG_boot/src/arch/aarch64/sync.rs | 2 +- X1_JTAG_boot/src/arch/aarch64/time.rs | 2 +- X1_JTAG_boot/src/bsp.rs | 2 +- X1_JTAG_boot/src/bsp/driver.rs | 2 +- X1_JTAG_boot/src/bsp/driver/bcm.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_gpio.rs | 2 +- .../src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs | 2 +- X1_JTAG_boot/src/bsp/rpi.rs | 2 +- X1_JTAG_boot/src/bsp/rpi/link.ld | 2 +- X1_JTAG_boot/src/bsp/rpi/memory_map.rs | 2 +- X1_JTAG_boot/src/interface.rs | 2 +- X1_JTAG_boot/src/main.rs | 2 +- X1_JTAG_boot/src/panic_wait.rs | 2 +- X1_JTAG_boot/src/print.rs | 2 +- X1_JTAG_boot/src/runtime_init.rs | 2 +- docker/rustembedded-osdev-utils/Dockerfile | 2 +- utils/clean_all.rb | 2 +- utils/clippy_all.rb | 2 +- utils/diff_all.rb | 2 +- utils/fmt_all.rb | 2 +- utils/helpers/copyrighted.rb | 2 +- utils/helpers/diff_tut_folders.bash | 2 +- utils/helpers/tutorial_folders.rb | 2 +- utils/make_all.rb | 2 +- utils/raspboot.bash | 2 +- utils/ready_for_publish.rb | 2 +- utils/sanity_checks.rb | 2 +- 233 files changed, 460 insertions(+), 247 deletions(-) create mode 100644 LICENSE-APACHE rename LICENSE => LICENSE-MIT (58%) diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 7d7e6728..3e87d502 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile index df1de73d..70ee5689 100644 --- a/01_wait_forever/Makefile +++ b/01_wait_forever/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/01_wait_forever/src/arch.rs b/01_wait_forever/src/arch.rs index b1f035c5..ee958823 100644 --- a/01_wait_forever/src/arch.rs +++ b/01_wait_forever/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/01_wait_forever/src/arch/aarch64.rs b/01_wait_forever/src/arch/aarch64.rs index 91fc1708..e999965c 100644 --- a/01_wait_forever/src/arch/aarch64.rs +++ b/01_wait_forever/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/01_wait_forever/src/arch/aarch64/start.S b/01_wait_forever/src/arch/aarch64/start.S index cbffc9bd..f059b847 100644 --- a/01_wait_forever/src/arch/aarch64/start.S +++ b/01_wait_forever/src/arch/aarch64/start.S @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/01_wait_forever/src/bsp.rs b/01_wait_forever/src/bsp.rs index 73d115c5..16734723 100644 --- a/01_wait_forever/src/bsp.rs +++ b/01_wait_forever/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/01_wait_forever/src/bsp/rpi.rs b/01_wait_forever/src/bsp/rpi.rs index bd7cc7b8..af36ea2c 100644 --- a/01_wait_forever/src/bsp/rpi.rs +++ b/01_wait_forever/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/01_wait_forever/src/bsp/rpi/link.ld b/01_wait_forever/src/bsp/rpi/link.ld index 837f26d0..ba2cb34d 100644 --- a/01_wait_forever/src/bsp/rpi/link.ld +++ b/01_wait_forever/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/01_wait_forever/src/main.rs b/01_wait_forever/src/main.rs index 81f6c115..bae66503 100644 --- a/01_wait_forever/src/main.rs +++ b/01_wait_forever/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/01_wait_forever/src/panic_wait.rs b/01_wait_forever/src/panic_wait.rs index 3d8ad6c3..5d781ee9 100644 --- a/01_wait_forever/src/panic_wait.rs +++ b/01_wait_forever/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile index df1de73d..70ee5689 100644 --- a/02_runtime_init/Makefile +++ b/02_runtime_init/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/README.md b/02_runtime_init/README.md index c47516c7..81e73898 100644 --- a/02_runtime_init/README.md +++ b/02_runtime_init/README.md @@ -108,7 +108,7 @@ diff -uNr 01_wait_forever/src/runtime_init.rs 02_runtime_init/src/runtime_init.r --- 01_wait_forever/src/runtime_init.rs +++ 02_runtime_init/src/runtime_init.rs @@ -0,0 +1,25 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + diff --git a/02_runtime_init/src/arch.rs b/02_runtime_init/src/arch.rs index b1f035c5..ee958823 100644 --- a/02_runtime_init/src/arch.rs +++ b/02_runtime_init/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/src/arch/aarch64.rs b/02_runtime_init/src/arch/aarch64.rs index 91fc1708..e999965c 100644 --- a/02_runtime_init/src/arch/aarch64.rs +++ b/02_runtime_init/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/src/arch/aarch64/start.S b/02_runtime_init/src/arch/aarch64/start.S index d3bf43b3..b56d3513 100644 --- a/02_runtime_init/src/arch/aarch64/start.S +++ b/02_runtime_init/src/arch/aarch64/start.S @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/src/bsp.rs b/02_runtime_init/src/bsp.rs index 73d115c5..16734723 100644 --- a/02_runtime_init/src/bsp.rs +++ b/02_runtime_init/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/src/bsp/rpi.rs b/02_runtime_init/src/bsp/rpi.rs index bd7cc7b8..af36ea2c 100644 --- a/02_runtime_init/src/bsp/rpi.rs +++ b/02_runtime_init/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/src/bsp/rpi/link.ld b/02_runtime_init/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/02_runtime_init/src/bsp/rpi/link.ld +++ b/02_runtime_init/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/02_runtime_init/src/main.rs b/02_runtime_init/src/main.rs index b7141947..95bab0ba 100644 --- a/02_runtime_init/src/main.rs +++ b/02_runtime_init/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/src/panic_wait.rs b/02_runtime_init/src/panic_wait.rs index 3d8ad6c3..5d781ee9 100644 --- a/02_runtime_init/src/panic_wait.rs +++ b/02_runtime_init/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/02_runtime_init/src/runtime_init.rs b/02_runtime_init/src/runtime_init.rs index 009dac0d..8da9ac03 100644 --- a/02_runtime_init/src/runtime_init.rs +++ b/02_runtime_init/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile index c488eb59..f34edb92 100644 --- a/03_hacky_hello_world/Makefile +++ b/03_hacky_hello_world/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/README.md b/03_hacky_hello_world/README.md index 733d9c53..a4793576 100644 --- a/03_hacky_hello_world/README.md +++ b/03_hacky_hello_world/README.md @@ -93,7 +93,7 @@ diff -uNr 02_runtime_init/src/interface.rs 03_hacky_hello_world/src/interface.rs --- 02_runtime_init/src/interface.rs +++ 03_hacky_hello_world/src/interface.rs @@ -0,0 +1,36 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + @@ -204,7 +204,7 @@ diff -uNr 02_runtime_init/src/print.rs 03_hacky_hello_world/src/print.rs --- 02_runtime_init/src/print.rs +++ 03_hacky_hello_world/src/print.rs @@ -0,0 +1,33 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + diff --git a/03_hacky_hello_world/src/arch.rs b/03_hacky_hello_world/src/arch.rs index b1f035c5..ee958823 100644 --- a/03_hacky_hello_world/src/arch.rs +++ b/03_hacky_hello_world/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/arch/aarch64.rs b/03_hacky_hello_world/src/arch/aarch64.rs index 91fc1708..e999965c 100644 --- a/03_hacky_hello_world/src/arch/aarch64.rs +++ b/03_hacky_hello_world/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/arch/aarch64/start.S b/03_hacky_hello_world/src/arch/aarch64/start.S index d3bf43b3..b56d3513 100644 --- a/03_hacky_hello_world/src/arch/aarch64/start.S +++ b/03_hacky_hello_world/src/arch/aarch64/start.S @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/bsp.rs b/03_hacky_hello_world/src/bsp.rs index 73d115c5..16734723 100644 --- a/03_hacky_hello_world/src/bsp.rs +++ b/03_hacky_hello_world/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/bsp/rpi.rs b/03_hacky_hello_world/src/bsp/rpi.rs index 504c5990..ed810b96 100644 --- a/03_hacky_hello_world/src/bsp/rpi.rs +++ b/03_hacky_hello_world/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/bsp/rpi/link.ld b/03_hacky_hello_world/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/03_hacky_hello_world/src/bsp/rpi/link.ld +++ b/03_hacky_hello_world/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/03_hacky_hello_world/src/interface.rs b/03_hacky_hello_world/src/interface.rs index 79d74a5f..28b17379 100644 --- a/03_hacky_hello_world/src/interface.rs +++ b/03_hacky_hello_world/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/main.rs b/03_hacky_hello_world/src/main.rs index 0416783c..4e2bcef6 100644 --- a/03_hacky_hello_world/src/main.rs +++ b/03_hacky_hello_world/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/panic_wait.rs b/03_hacky_hello_world/src/panic_wait.rs index 5e6d3fa5..0c99b2ea 100644 --- a/03_hacky_hello_world/src/panic_wait.rs +++ b/03_hacky_hello_world/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/print.rs b/03_hacky_hello_world/src/print.rs index a7fa1360..86e5da83 100644 --- a/03_hacky_hello_world/src/print.rs +++ b/03_hacky_hello_world/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/03_hacky_hello_world/src/runtime_init.rs b/03_hacky_hello_world/src/runtime_init.rs index 009dac0d..8da9ac03 100644 --- a/03_hacky_hello_world/src/runtime_init.rs +++ b/03_hacky_hello_world/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/Makefile b/04_zero_overhead_abstraction/Makefile index c488eb59..f34edb92 100644 --- a/04_zero_overhead_abstraction/Makefile +++ b/04_zero_overhead_abstraction/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/README.md b/04_zero_overhead_abstraction/README.md index 079c4981..10c7d27f 100644 --- a/04_zero_overhead_abstraction/README.md +++ b/04_zero_overhead_abstraction/README.md @@ -32,7 +32,7 @@ diff -uNr 03_hacky_hello_world/src/arch/aarch64/start.S 04_zero_overhead_abstrac --- 03_hacky_hello_world/src/arch/aarch64/start.S +++ 04_zero_overhead_abstraction/src/arch/aarch64/start.S @@ -1,21 +0,0 @@ --// SPDX-License-Identifier: MIT +-// SPDX-License-Identifier: MIT OR Apache-2.0 -// -// Copyright (c) 2018-2019 Andre Richter - diff --git a/04_zero_overhead_abstraction/src/arch.rs b/04_zero_overhead_abstraction/src/arch.rs index b1f035c5..ee958823 100644 --- a/04_zero_overhead_abstraction/src/arch.rs +++ b/04_zero_overhead_abstraction/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/src/arch/aarch64.rs b/04_zero_overhead_abstraction/src/arch/aarch64.rs index 5a74d62c..9ccdf120 100644 --- a/04_zero_overhead_abstraction/src/arch/aarch64.rs +++ b/04_zero_overhead_abstraction/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/src/bsp.rs b/04_zero_overhead_abstraction/src/bsp.rs index 73d115c5..16734723 100644 --- a/04_zero_overhead_abstraction/src/bsp.rs +++ b/04_zero_overhead_abstraction/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/src/bsp/rpi.rs b/04_zero_overhead_abstraction/src/bsp/rpi.rs index 59e06d37..7c9a6e36 100644 --- a/04_zero_overhead_abstraction/src/bsp/rpi.rs +++ b/04_zero_overhead_abstraction/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/src/bsp/rpi/link.ld b/04_zero_overhead_abstraction/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/04_zero_overhead_abstraction/src/bsp/rpi/link.ld +++ b/04_zero_overhead_abstraction/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/04_zero_overhead_abstraction/src/interface.rs b/04_zero_overhead_abstraction/src/interface.rs index 79d74a5f..28b17379 100644 --- a/04_zero_overhead_abstraction/src/interface.rs +++ b/04_zero_overhead_abstraction/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/src/main.rs b/04_zero_overhead_abstraction/src/main.rs index fecad796..38bcf830 100644 --- a/04_zero_overhead_abstraction/src/main.rs +++ b/04_zero_overhead_abstraction/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/src/panic_wait.rs b/04_zero_overhead_abstraction/src/panic_wait.rs index 5e6d3fa5..0c99b2ea 100644 --- a/04_zero_overhead_abstraction/src/panic_wait.rs +++ b/04_zero_overhead_abstraction/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/src/print.rs b/04_zero_overhead_abstraction/src/print.rs index a7fa1360..86e5da83 100644 --- a/04_zero_overhead_abstraction/src/print.rs +++ b/04_zero_overhead_abstraction/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/04_zero_overhead_abstraction/src/runtime_init.rs b/04_zero_overhead_abstraction/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/04_zero_overhead_abstraction/src/runtime_init.rs +++ b/04_zero_overhead_abstraction/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/Makefile b/05_safe_globals/Makefile index c488eb59..f34edb92 100644 --- a/05_safe_globals/Makefile +++ b/05_safe_globals/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/README.md b/05_safe_globals/README.md index 78984217..9b97f0f3 100644 --- a/05_safe_globals/README.md +++ b/05_safe_globals/README.md @@ -56,7 +56,7 @@ diff -uNr 04_zero_overhead_abstraction/src/arch/aarch64/sync.rs 05_safe_globals/ --- 04_zero_overhead_abstraction/src/arch/aarch64/sync.rs +++ 05_safe_globals/src/arch/aarch64/sync.rs @@ -0,0 +1,52 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + diff --git a/05_safe_globals/src/arch.rs b/05_safe_globals/src/arch.rs index b1f035c5..ee958823 100644 --- a/05_safe_globals/src/arch.rs +++ b/05_safe_globals/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/arch/aarch64.rs b/05_safe_globals/src/arch/aarch64.rs index bd2f74c4..dab6e08b 100644 --- a/05_safe_globals/src/arch/aarch64.rs +++ b/05_safe_globals/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/arch/aarch64/sync.rs b/05_safe_globals/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/05_safe_globals/src/arch/aarch64/sync.rs +++ b/05_safe_globals/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/bsp.rs b/05_safe_globals/src/bsp.rs index 73d115c5..16734723 100644 --- a/05_safe_globals/src/bsp.rs +++ b/05_safe_globals/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/bsp/rpi.rs b/05_safe_globals/src/bsp/rpi.rs index 281af612..ce467ee4 100644 --- a/05_safe_globals/src/bsp/rpi.rs +++ b/05_safe_globals/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/bsp/rpi/link.ld b/05_safe_globals/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/05_safe_globals/src/bsp/rpi/link.ld +++ b/05_safe_globals/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/05_safe_globals/src/interface.rs b/05_safe_globals/src/interface.rs index 005e625d..84c0b317 100644 --- a/05_safe_globals/src/interface.rs +++ b/05_safe_globals/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/main.rs b/05_safe_globals/src/main.rs index e565b41d..ee6478a8 100644 --- a/05_safe_globals/src/main.rs +++ b/05_safe_globals/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/panic_wait.rs b/05_safe_globals/src/panic_wait.rs index 5e6d3fa5..0c99b2ea 100644 --- a/05_safe_globals/src/panic_wait.rs +++ b/05_safe_globals/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/print.rs b/05_safe_globals/src/print.rs index a7fa1360..86e5da83 100644 --- a/05_safe_globals/src/print.rs +++ b/05_safe_globals/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/05_safe_globals/src/runtime_init.rs b/05_safe_globals/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/05_safe_globals/src/runtime_init.rs +++ b/05_safe_globals/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/Makefile b/06_drivers_gpio_uart/Makefile index c488eb59..f34edb92 100644 --- a/06_drivers_gpio_uart/Makefile +++ b/06_drivers_gpio_uart/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/README.md b/06_drivers_gpio_uart/README.md index 404efd05..e85d5f15 100644 --- a/06_drivers_gpio_uart/README.md +++ b/06_drivers_gpio_uart/README.md @@ -126,7 +126,7 @@ diff -uNr 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_gpio.rs 06_drivers_gpio_uar --- 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ 06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -0,0 +1,145 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + @@ -276,7 +276,7 @@ diff -uNr 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs 06_drivers_gp --- 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ 06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -0,0 +1,307 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + @@ -588,7 +588,7 @@ diff -uNr 05_safe_globals/src/bsp/driver/bcm.rs 06_drivers_gpio_uart/src/bsp/dri --- 05_safe_globals/src/bsp/driver/bcm.rs +++ 06_drivers_gpio_uart/src/bsp/driver/bcm.rs @@ -0,0 +1,11 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + @@ -604,7 +604,7 @@ diff -uNr 05_safe_globals/src/bsp/driver.rs 06_drivers_gpio_uart/src/bsp/driver. --- 05_safe_globals/src/bsp/driver.rs +++ 06_drivers_gpio_uart/src/bsp/driver.rs @@ -0,0 +1,11 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + @@ -620,7 +620,7 @@ diff -uNr 05_safe_globals/src/bsp/rpi/memory_map.rs 06_drivers_gpio_uart/src/bsp --- 05_safe_globals/src/bsp/rpi/memory_map.rs +++ 06_drivers_gpio_uart/src/bsp/rpi/memory_map.rs @@ -0,0 +1,18 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + diff --git a/06_drivers_gpio_uart/src/arch.rs b/06_drivers_gpio_uart/src/arch.rs index b1f035c5..ee958823 100644 --- a/06_drivers_gpio_uart/src/arch.rs +++ b/06_drivers_gpio_uart/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/arch/aarch64.rs b/06_drivers_gpio_uart/src/arch/aarch64.rs index e196f986..e11e99b6 100644 --- a/06_drivers_gpio_uart/src/arch/aarch64.rs +++ b/06_drivers_gpio_uart/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/arch/aarch64/sync.rs b/06_drivers_gpio_uart/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/06_drivers_gpio_uart/src/arch/aarch64/sync.rs +++ b/06_drivers_gpio_uart/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/bsp.rs b/06_drivers_gpio_uart/src/bsp.rs index 3db8e14a..2193a046 100644 --- a/06_drivers_gpio_uart/src/bsp.rs +++ b/06_drivers_gpio_uart/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/bsp/driver.rs b/06_drivers_gpio_uart/src/bsp/driver.rs index c910274e..2c52ae61 100644 --- a/06_drivers_gpio_uart/src/bsp/driver.rs +++ b/06_drivers_gpio_uart/src/bsp/driver.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/bsp/driver/bcm.rs b/06_drivers_gpio_uart/src/bsp/driver/bcm.rs index 16df7f3d..33383276 100644 --- a/06_drivers_gpio_uart/src/bsp/driver/bcm.rs +++ b/06_drivers_gpio_uart/src/bsp/driver/bcm.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs index bc66bbcc..e6f5f7ca 100644 --- a/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ b/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs b/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs index ef442cee..fbe8b849 100644 --- a/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ b/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/bsp/rpi.rs b/06_drivers_gpio_uart/src/bsp/rpi.rs index 47cbbab9..197258c1 100644 --- a/06_drivers_gpio_uart/src/bsp/rpi.rs +++ b/06_drivers_gpio_uart/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/bsp/rpi/link.ld b/06_drivers_gpio_uart/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/06_drivers_gpio_uart/src/bsp/rpi/link.ld +++ b/06_drivers_gpio_uart/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/06_drivers_gpio_uart/src/bsp/rpi/memory_map.rs b/06_drivers_gpio_uart/src/bsp/rpi/memory_map.rs index ed617f5e..4176837b 100644 --- a/06_drivers_gpio_uart/src/bsp/rpi/memory_map.rs +++ b/06_drivers_gpio_uart/src/bsp/rpi/memory_map.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/interface.rs b/06_drivers_gpio_uart/src/interface.rs index 683faa84..9178eb60 100644 --- a/06_drivers_gpio_uart/src/interface.rs +++ b/06_drivers_gpio_uart/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/main.rs b/06_drivers_gpio_uart/src/main.rs index 07c76abd..bf903c6f 100644 --- a/06_drivers_gpio_uart/src/main.rs +++ b/06_drivers_gpio_uart/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/panic_wait.rs b/06_drivers_gpio_uart/src/panic_wait.rs index a8d2cc48..6ae8488a 100644 --- a/06_drivers_gpio_uart/src/panic_wait.rs +++ b/06_drivers_gpio_uart/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/print.rs b/06_drivers_gpio_uart/src/print.rs index a7fa1360..86e5da83 100644 --- a/06_drivers_gpio_uart/src/print.rs +++ b/06_drivers_gpio_uart/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/06_drivers_gpio_uart/src/runtime_init.rs b/06_drivers_gpio_uart/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/06_drivers_gpio_uart/src/runtime_init.rs +++ b/06_drivers_gpio_uart/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/Makefile b/07_uart_chainloader/Makefile index 8404eb6c..8a58fa8d 100644 --- a/07_uart_chainloader/Makefile +++ b/07_uart_chainloader/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/README.md b/07_uart_chainloader/README.md index b0b32903..1de80321 100644 --- a/07_uart_chainloader/README.md +++ b/07_uart_chainloader/README.md @@ -361,7 +361,7 @@ diff -uNr 06_drivers_gpio_uart/src/relocate.rs 07_uart_chainloader/src/relocate. --- 06_drivers_gpio_uart/src/relocate.rs +++ 07_uart_chainloader/src/relocate.rs @@ -0,0 +1,46 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + diff --git a/07_uart_chainloader/src/arch.rs b/07_uart_chainloader/src/arch.rs index b1f035c5..ee958823 100644 --- a/07_uart_chainloader/src/arch.rs +++ b/07_uart_chainloader/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/arch/aarch64.rs b/07_uart_chainloader/src/arch/aarch64.rs index 91c27e4a..2ee34769 100644 --- a/07_uart_chainloader/src/arch/aarch64.rs +++ b/07_uart_chainloader/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/arch/aarch64/sync.rs b/07_uart_chainloader/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/07_uart_chainloader/src/arch/aarch64/sync.rs +++ b/07_uart_chainloader/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/bsp.rs b/07_uart_chainloader/src/bsp.rs index 3db8e14a..2193a046 100644 --- a/07_uart_chainloader/src/bsp.rs +++ b/07_uart_chainloader/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/bsp/driver.rs b/07_uart_chainloader/src/bsp/driver.rs index c910274e..2c52ae61 100644 --- a/07_uart_chainloader/src/bsp/driver.rs +++ b/07_uart_chainloader/src/bsp/driver.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/bsp/driver/bcm.rs b/07_uart_chainloader/src/bsp/driver/bcm.rs index 16df7f3d..33383276 100644 --- a/07_uart_chainloader/src/bsp/driver/bcm.rs +++ b/07_uart_chainloader/src/bsp/driver/bcm.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_gpio.rs index bc66bbcc..e6f5f7ca 100644 --- a/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ b/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs b/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs index baae8c24..c9988e47 100644 --- a/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ b/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/bsp/rpi.rs b/07_uart_chainloader/src/bsp/rpi.rs index 6f803150..77fef475 100644 --- a/07_uart_chainloader/src/bsp/rpi.rs +++ b/07_uart_chainloader/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/bsp/rpi/link.ld b/07_uart_chainloader/src/bsp/rpi/link.ld index d512c82c..7e595734 100644 --- a/07_uart_chainloader/src/bsp/rpi/link.ld +++ b/07_uart_chainloader/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/07_uart_chainloader/src/bsp/rpi/memory_map.rs b/07_uart_chainloader/src/bsp/rpi/memory_map.rs index ed617f5e..4176837b 100644 --- a/07_uart_chainloader/src/bsp/rpi/memory_map.rs +++ b/07_uart_chainloader/src/bsp/rpi/memory_map.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/interface.rs b/07_uart_chainloader/src/interface.rs index 0f832222..420aeaf3 100644 --- a/07_uart_chainloader/src/interface.rs +++ b/07_uart_chainloader/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/main.rs b/07_uart_chainloader/src/main.rs index 90dc2928..c2bc5605 100644 --- a/07_uart_chainloader/src/main.rs +++ b/07_uart_chainloader/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/panic_wait.rs b/07_uart_chainloader/src/panic_wait.rs index a8d2cc48..6ae8488a 100644 --- a/07_uart_chainloader/src/panic_wait.rs +++ b/07_uart_chainloader/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/print.rs b/07_uart_chainloader/src/print.rs index a7fa1360..86e5da83 100644 --- a/07_uart_chainloader/src/print.rs +++ b/07_uart_chainloader/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/relocate.rs b/07_uart_chainloader/src/relocate.rs index 30cd2257..9223d298 100644 --- a/07_uart_chainloader/src/relocate.rs +++ b/07_uart_chainloader/src/relocate.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/07_uart_chainloader/src/runtime_init.rs b/07_uart_chainloader/src/runtime_init.rs index cde735f5..38356008 100644 --- a/07_uart_chainloader/src/runtime_init.rs +++ b/07_uart_chainloader/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/Makefile b/08_timestamps/Makefile index 964daee0..ffa386af 100644 --- a/08_timestamps/Makefile +++ b/08_timestamps/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/README.md b/08_timestamps/README.md index b0bb3986..b237617e 100644 --- a/08_timestamps/README.md +++ b/08_timestamps/README.md @@ -101,7 +101,7 @@ diff -uNr 07_uart_chainloader/src/arch/aarch64/time.rs 08_timestamps/src/arch/aa --- 07_uart_chainloader/src/arch/aarch64/time.rs +++ 08_timestamps/src/arch/aarch64/time.rs @@ -0,0 +1,81 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + @@ -490,7 +490,7 @@ diff -uNr 07_uart_chainloader/src/relocate.rs 08_timestamps/src/relocate.rs --- 07_uart_chainloader/src/relocate.rs +++ 08_timestamps/src/relocate.rs @@ -1,46 +0,0 @@ --// SPDX-License-Identifier: MIT +-// SPDX-License-Identifier: MIT OR Apache-2.0 -// -// Copyright (c) 2018-2019 Andre Richter - diff --git a/08_timestamps/src/arch.rs b/08_timestamps/src/arch.rs index b1f035c5..ee958823 100644 --- a/08_timestamps/src/arch.rs +++ b/08_timestamps/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/arch/aarch64.rs b/08_timestamps/src/arch/aarch64.rs index 70940af1..e3893bf4 100644 --- a/08_timestamps/src/arch/aarch64.rs +++ b/08_timestamps/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/arch/aarch64/sync.rs b/08_timestamps/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/08_timestamps/src/arch/aarch64/sync.rs +++ b/08_timestamps/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/arch/aarch64/time.rs b/08_timestamps/src/arch/aarch64/time.rs index a6638976..d4fa88f1 100644 --- a/08_timestamps/src/arch/aarch64/time.rs +++ b/08_timestamps/src/arch/aarch64/time.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/bsp.rs b/08_timestamps/src/bsp.rs index 3db8e14a..2193a046 100644 --- a/08_timestamps/src/bsp.rs +++ b/08_timestamps/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/bsp/driver.rs b/08_timestamps/src/bsp/driver.rs index c910274e..2c52ae61 100644 --- a/08_timestamps/src/bsp/driver.rs +++ b/08_timestamps/src/bsp/driver.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/bsp/driver/bcm.rs b/08_timestamps/src/bsp/driver/bcm.rs index 16df7f3d..33383276 100644 --- a/08_timestamps/src/bsp/driver/bcm.rs +++ b/08_timestamps/src/bsp/driver/bcm.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/08_timestamps/src/bsp/driver/bcm/bcm2xxx_gpio.rs index bc66bbcc..e6f5f7ca 100644 --- a/08_timestamps/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ b/08_timestamps/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs b/08_timestamps/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs index 987a55cc..78471c3d 100644 --- a/08_timestamps/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ b/08_timestamps/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/bsp/rpi.rs b/08_timestamps/src/bsp/rpi.rs index 47cbbab9..197258c1 100644 --- a/08_timestamps/src/bsp/rpi.rs +++ b/08_timestamps/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/bsp/rpi/link.ld b/08_timestamps/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/08_timestamps/src/bsp/rpi/link.ld +++ b/08_timestamps/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/08_timestamps/src/bsp/rpi/memory_map.rs b/08_timestamps/src/bsp/rpi/memory_map.rs index ed617f5e..4176837b 100644 --- a/08_timestamps/src/bsp/rpi/memory_map.rs +++ b/08_timestamps/src/bsp/rpi/memory_map.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/interface.rs b/08_timestamps/src/interface.rs index 55df89cb..134dbfd5 100644 --- a/08_timestamps/src/interface.rs +++ b/08_timestamps/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/main.rs b/08_timestamps/src/main.rs index b64756ba..09bfa2f9 100644 --- a/08_timestamps/src/main.rs +++ b/08_timestamps/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/panic_wait.rs b/08_timestamps/src/panic_wait.rs index a8d2cc48..6ae8488a 100644 --- a/08_timestamps/src/panic_wait.rs +++ b/08_timestamps/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/print.rs b/08_timestamps/src/print.rs index 6e8a45b5..7bd8d6ef 100644 --- a/08_timestamps/src/print.rs +++ b/08_timestamps/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/08_timestamps/src/runtime_init.rs b/08_timestamps/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/08_timestamps/src/runtime_init.rs +++ b/08_timestamps/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/Makefile b/09_hw_debug_JTAG/Makefile index 84f81bc6..fb661c66 100644 --- a/09_hw_debug_JTAG/Makefile +++ b/09_hw_debug_JTAG/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/arch.rs b/09_hw_debug_JTAG/src/arch.rs index b1f035c5..ee958823 100644 --- a/09_hw_debug_JTAG/src/arch.rs +++ b/09_hw_debug_JTAG/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/arch/aarch64.rs b/09_hw_debug_JTAG/src/arch/aarch64.rs index 70940af1..e3893bf4 100644 --- a/09_hw_debug_JTAG/src/arch/aarch64.rs +++ b/09_hw_debug_JTAG/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/arch/aarch64/sync.rs b/09_hw_debug_JTAG/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/09_hw_debug_JTAG/src/arch/aarch64/sync.rs +++ b/09_hw_debug_JTAG/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/arch/aarch64/time.rs b/09_hw_debug_JTAG/src/arch/aarch64/time.rs index a6638976..d4fa88f1 100644 --- a/09_hw_debug_JTAG/src/arch/aarch64/time.rs +++ b/09_hw_debug_JTAG/src/arch/aarch64/time.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/bsp.rs b/09_hw_debug_JTAG/src/bsp.rs index 3db8e14a..2193a046 100644 --- a/09_hw_debug_JTAG/src/bsp.rs +++ b/09_hw_debug_JTAG/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/bsp/driver.rs b/09_hw_debug_JTAG/src/bsp/driver.rs index c910274e..2c52ae61 100644 --- a/09_hw_debug_JTAG/src/bsp/driver.rs +++ b/09_hw_debug_JTAG/src/bsp/driver.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/bsp/driver/bcm.rs b/09_hw_debug_JTAG/src/bsp/driver/bcm.rs index 16df7f3d..33383276 100644 --- a/09_hw_debug_JTAG/src/bsp/driver/bcm.rs +++ b/09_hw_debug_JTAG/src/bsp/driver/bcm.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/09_hw_debug_JTAG/src/bsp/driver/bcm/bcm2xxx_gpio.rs index bc66bbcc..e6f5f7ca 100644 --- a/09_hw_debug_JTAG/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ b/09_hw_debug_JTAG/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs b/09_hw_debug_JTAG/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs index 987a55cc..78471c3d 100644 --- a/09_hw_debug_JTAG/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ b/09_hw_debug_JTAG/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/bsp/rpi.rs b/09_hw_debug_JTAG/src/bsp/rpi.rs index 47cbbab9..197258c1 100644 --- a/09_hw_debug_JTAG/src/bsp/rpi.rs +++ b/09_hw_debug_JTAG/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/bsp/rpi/link.ld b/09_hw_debug_JTAG/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/09_hw_debug_JTAG/src/bsp/rpi/link.ld +++ b/09_hw_debug_JTAG/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/09_hw_debug_JTAG/src/bsp/rpi/memory_map.rs b/09_hw_debug_JTAG/src/bsp/rpi/memory_map.rs index ed617f5e..4176837b 100644 --- a/09_hw_debug_JTAG/src/bsp/rpi/memory_map.rs +++ b/09_hw_debug_JTAG/src/bsp/rpi/memory_map.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/interface.rs b/09_hw_debug_JTAG/src/interface.rs index 55df89cb..134dbfd5 100644 --- a/09_hw_debug_JTAG/src/interface.rs +++ b/09_hw_debug_JTAG/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/main.rs b/09_hw_debug_JTAG/src/main.rs index b64756ba..09bfa2f9 100644 --- a/09_hw_debug_JTAG/src/main.rs +++ b/09_hw_debug_JTAG/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/panic_wait.rs b/09_hw_debug_JTAG/src/panic_wait.rs index a8d2cc48..6ae8488a 100644 --- a/09_hw_debug_JTAG/src/panic_wait.rs +++ b/09_hw_debug_JTAG/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/print.rs b/09_hw_debug_JTAG/src/print.rs index 6e8a45b5..7bd8d6ef 100644 --- a/09_hw_debug_JTAG/src/print.rs +++ b/09_hw_debug_JTAG/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/09_hw_debug_JTAG/src/runtime_init.rs b/09_hw_debug_JTAG/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/09_hw_debug_JTAG/src/runtime_init.rs +++ b/09_hw_debug_JTAG/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/Makefile b/10_privilege_level/Makefile index 84f81bc6..fb661c66 100644 --- a/10_privilege_level/Makefile +++ b/10_privilege_level/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/README.md b/10_privilege_level/README.md index 6163c30b..8837a198 100644 --- a/10_privilege_level/README.md +++ b/10_privilege_level/README.md @@ -214,7 +214,7 @@ diff -uNr 09_hw_debug_JTAG/src/arch/aarch64/exception.rs 10_privilege_level/src/ --- 09_hw_debug_JTAG/src/arch/aarch64/exception.rs +++ 10_privilege_level/src/arch/aarch64/exception.rs @@ -0,0 +1,48 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + diff --git a/10_privilege_level/src/arch.rs b/10_privilege_level/src/arch.rs index b1f035c5..ee958823 100644 --- a/10_privilege_level/src/arch.rs +++ b/10_privilege_level/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/arch/aarch64.rs b/10_privilege_level/src/arch/aarch64.rs index 692f6ddb..3ba64ea6 100644 --- a/10_privilege_level/src/arch/aarch64.rs +++ b/10_privilege_level/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/arch/aarch64/exception.rs b/10_privilege_level/src/arch/aarch64/exception.rs index f8d33f94..b1f725ff 100644 --- a/10_privilege_level/src/arch/aarch64/exception.rs +++ b/10_privilege_level/src/arch/aarch64/exception.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/arch/aarch64/sync.rs b/10_privilege_level/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/10_privilege_level/src/arch/aarch64/sync.rs +++ b/10_privilege_level/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/arch/aarch64/time.rs b/10_privilege_level/src/arch/aarch64/time.rs index a6638976..d4fa88f1 100644 --- a/10_privilege_level/src/arch/aarch64/time.rs +++ b/10_privilege_level/src/arch/aarch64/time.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/bsp.rs b/10_privilege_level/src/bsp.rs index 3db8e14a..2193a046 100644 --- a/10_privilege_level/src/bsp.rs +++ b/10_privilege_level/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/bsp/driver.rs b/10_privilege_level/src/bsp/driver.rs index c910274e..2c52ae61 100644 --- a/10_privilege_level/src/bsp/driver.rs +++ b/10_privilege_level/src/bsp/driver.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/bsp/driver/bcm.rs b/10_privilege_level/src/bsp/driver/bcm.rs index 16df7f3d..33383276 100644 --- a/10_privilege_level/src/bsp/driver/bcm.rs +++ b/10_privilege_level/src/bsp/driver/bcm.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/10_privilege_level/src/bsp/driver/bcm/bcm2xxx_gpio.rs index bc66bbcc..e6f5f7ca 100644 --- a/10_privilege_level/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ b/10_privilege_level/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs b/10_privilege_level/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs index 987a55cc..78471c3d 100644 --- a/10_privilege_level/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ b/10_privilege_level/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/bsp/rpi.rs b/10_privilege_level/src/bsp/rpi.rs index 47cbbab9..197258c1 100644 --- a/10_privilege_level/src/bsp/rpi.rs +++ b/10_privilege_level/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/bsp/rpi/link.ld b/10_privilege_level/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/10_privilege_level/src/bsp/rpi/link.ld +++ b/10_privilege_level/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/10_privilege_level/src/bsp/rpi/memory_map.rs b/10_privilege_level/src/bsp/rpi/memory_map.rs index ed617f5e..4176837b 100644 --- a/10_privilege_level/src/bsp/rpi/memory_map.rs +++ b/10_privilege_level/src/bsp/rpi/memory_map.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/interface.rs b/10_privilege_level/src/interface.rs index 55df89cb..134dbfd5 100644 --- a/10_privilege_level/src/interface.rs +++ b/10_privilege_level/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/main.rs b/10_privilege_level/src/main.rs index 1e79195d..92a9d0c6 100644 --- a/10_privilege_level/src/main.rs +++ b/10_privilege_level/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/panic_wait.rs b/10_privilege_level/src/panic_wait.rs index a8d2cc48..6ae8488a 100644 --- a/10_privilege_level/src/panic_wait.rs +++ b/10_privilege_level/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/print.rs b/10_privilege_level/src/print.rs index 6e8a45b5..7bd8d6ef 100644 --- a/10_privilege_level/src/print.rs +++ b/10_privilege_level/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/10_privilege_level/src/runtime_init.rs b/10_privilege_level/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/10_privilege_level/src/runtime_init.rs +++ b/10_privilege_level/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/Makefile b/11_virtual_memory/Makefile index 84f81bc6..fb661c66 100644 --- a/11_virtual_memory/Makefile +++ b/11_virtual_memory/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/README.md b/11_virtual_memory/README.md index 390d7703..00bf0497 100644 --- a/11_virtual_memory/README.md +++ b/11_virtual_memory/README.md @@ -270,7 +270,7 @@ diff -uNr 10_privilege_level/src/arch/aarch64/mmu.rs 11_virtual_memory/src/arch/ --- 10_privilege_level/src/arch/aarch64/mmu.rs +++ 11_virtual_memory/src/arch/aarch64/mmu.rs @@ -0,0 +1,300 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + @@ -662,7 +662,7 @@ diff -uNr 10_privilege_level/src/bsp/rpi/virt_mem_layout.rs 11_virtual_memory/sr --- 10_privilege_level/src/bsp/rpi/virt_mem_layout.rs +++ 11_virtual_memory/src/bsp/rpi/virt_mem_layout.rs @@ -0,0 +1,82 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + @@ -873,7 +873,7 @@ diff -uNr 10_privilege_level/src/memory.rs 11_virtual_memory/src/memory.rs --- 10_privilege_level/src/memory.rs +++ 11_virtual_memory/src/memory.rs @@ -0,0 +1,147 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + diff --git a/11_virtual_memory/src/arch.rs b/11_virtual_memory/src/arch.rs index b1f035c5..ee958823 100644 --- a/11_virtual_memory/src/arch.rs +++ b/11_virtual_memory/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/arch/aarch64.rs b/11_virtual_memory/src/arch/aarch64.rs index da8414f0..a77782c8 100644 --- a/11_virtual_memory/src/arch/aarch64.rs +++ b/11_virtual_memory/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/arch/aarch64/exception.rs b/11_virtual_memory/src/arch/aarch64/exception.rs index f8d33f94..b1f725ff 100644 --- a/11_virtual_memory/src/arch/aarch64/exception.rs +++ b/11_virtual_memory/src/arch/aarch64/exception.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/arch/aarch64/mmu.rs b/11_virtual_memory/src/arch/aarch64/mmu.rs index 7cee795f..0c0c9202 100644 --- a/11_virtual_memory/src/arch/aarch64/mmu.rs +++ b/11_virtual_memory/src/arch/aarch64/mmu.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/arch/aarch64/sync.rs b/11_virtual_memory/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/11_virtual_memory/src/arch/aarch64/sync.rs +++ b/11_virtual_memory/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/arch/aarch64/time.rs b/11_virtual_memory/src/arch/aarch64/time.rs index a6638976..d4fa88f1 100644 --- a/11_virtual_memory/src/arch/aarch64/time.rs +++ b/11_virtual_memory/src/arch/aarch64/time.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/bsp.rs b/11_virtual_memory/src/bsp.rs index 5c5656d7..c70d86ef 100644 --- a/11_virtual_memory/src/bsp.rs +++ b/11_virtual_memory/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/bsp/driver.rs b/11_virtual_memory/src/bsp/driver.rs index c910274e..2c52ae61 100644 --- a/11_virtual_memory/src/bsp/driver.rs +++ b/11_virtual_memory/src/bsp/driver.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/bsp/driver/bcm.rs b/11_virtual_memory/src/bsp/driver/bcm.rs index 16df7f3d..33383276 100644 --- a/11_virtual_memory/src/bsp/driver/bcm.rs +++ b/11_virtual_memory/src/bsp/driver/bcm.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/11_virtual_memory/src/bsp/driver/bcm/bcm2xxx_gpio.rs index bc66bbcc..e6f5f7ca 100644 --- a/11_virtual_memory/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ b/11_virtual_memory/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs b/11_virtual_memory/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs index 987a55cc..78471c3d 100644 --- a/11_virtual_memory/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ b/11_virtual_memory/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/bsp/rpi.rs b/11_virtual_memory/src/bsp/rpi.rs index d59d76b7..27c6bc12 100644 --- a/11_virtual_memory/src/bsp/rpi.rs +++ b/11_virtual_memory/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/bsp/rpi/link.ld b/11_virtual_memory/src/bsp/rpi/link.ld index 4ed0f152..5745d96d 100644 --- a/11_virtual_memory/src/bsp/rpi/link.ld +++ b/11_virtual_memory/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/11_virtual_memory/src/bsp/rpi/memory_map.rs b/11_virtual_memory/src/bsp/rpi/memory_map.rs index b223b26a..42615582 100644 --- a/11_virtual_memory/src/bsp/rpi/memory_map.rs +++ b/11_virtual_memory/src/bsp/rpi/memory_map.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/bsp/rpi/virt_mem_layout.rs b/11_virtual_memory/src/bsp/rpi/virt_mem_layout.rs index 0c05aa6d..dedebc1d 100644 --- a/11_virtual_memory/src/bsp/rpi/virt_mem_layout.rs +++ b/11_virtual_memory/src/bsp/rpi/virt_mem_layout.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/interface.rs b/11_virtual_memory/src/interface.rs index 24b3eb28..0d4a3a23 100644 --- a/11_virtual_memory/src/interface.rs +++ b/11_virtual_memory/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/main.rs b/11_virtual_memory/src/main.rs index 569546be..1bee9b28 100644 --- a/11_virtual_memory/src/main.rs +++ b/11_virtual_memory/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/memory.rs b/11_virtual_memory/src/memory.rs index cd76c7ee..e9c21ab3 100644 --- a/11_virtual_memory/src/memory.rs +++ b/11_virtual_memory/src/memory.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/panic_wait.rs b/11_virtual_memory/src/panic_wait.rs index a8d2cc48..6ae8488a 100644 --- a/11_virtual_memory/src/panic_wait.rs +++ b/11_virtual_memory/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/print.rs b/11_virtual_memory/src/print.rs index 6e8a45b5..7bd8d6ef 100644 --- a/11_virtual_memory/src/print.rs +++ b/11_virtual_memory/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/11_virtual_memory/src/runtime_init.rs b/11_virtual_memory/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/11_virtual_memory/src/runtime_init.rs +++ b/11_virtual_memory/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/Makefile b/12_cpu_exceptions_part1/Makefile index 84f81bc6..fb661c66 100644 --- a/12_cpu_exceptions_part1/Makefile +++ b/12_cpu_exceptions_part1/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/README.md b/12_cpu_exceptions_part1/README.md index 6a1569da..138809b0 100644 --- a/12_cpu_exceptions_part1/README.md +++ b/12_cpu_exceptions_part1/README.md @@ -717,7 +717,7 @@ diff -uNr 11_virtual_memory/src/arch/aarch64/exception.S 12_cpu_exceptions_part1 --- 11_virtual_memory/src/arch/aarch64/exception.S +++ 12_cpu_exceptions_part1/src/arch/aarch64/exception.S @@ -0,0 +1,135 @@ -+// SPDX-License-Identifier: MIT ++// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2019 Andre Richter + diff --git a/12_cpu_exceptions_part1/src/arch.rs b/12_cpu_exceptions_part1/src/arch.rs index b1f035c5..ee958823 100644 --- a/12_cpu_exceptions_part1/src/arch.rs +++ b/12_cpu_exceptions_part1/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/arch/aarch64.rs b/12_cpu_exceptions_part1/src/arch/aarch64.rs index 9d50c2c8..588d87e5 100644 --- a/12_cpu_exceptions_part1/src/arch/aarch64.rs +++ b/12_cpu_exceptions_part1/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/arch/aarch64/exception.S b/12_cpu_exceptions_part1/src/arch/aarch64/exception.S index b6a2b2ad..3fbac5d0 100644 --- a/12_cpu_exceptions_part1/src/arch/aarch64/exception.S +++ b/12_cpu_exceptions_part1/src/arch/aarch64/exception.S @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/arch/aarch64/exception.rs b/12_cpu_exceptions_part1/src/arch/aarch64/exception.rs index 30c986bf..b8e65211 100644 --- a/12_cpu_exceptions_part1/src/arch/aarch64/exception.rs +++ b/12_cpu_exceptions_part1/src/arch/aarch64/exception.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/arch/aarch64/mmu.rs b/12_cpu_exceptions_part1/src/arch/aarch64/mmu.rs index 7cee795f..0c0c9202 100644 --- a/12_cpu_exceptions_part1/src/arch/aarch64/mmu.rs +++ b/12_cpu_exceptions_part1/src/arch/aarch64/mmu.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/arch/aarch64/sync.rs b/12_cpu_exceptions_part1/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/12_cpu_exceptions_part1/src/arch/aarch64/sync.rs +++ b/12_cpu_exceptions_part1/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/arch/aarch64/time.rs b/12_cpu_exceptions_part1/src/arch/aarch64/time.rs index a6638976..d4fa88f1 100644 --- a/12_cpu_exceptions_part1/src/arch/aarch64/time.rs +++ b/12_cpu_exceptions_part1/src/arch/aarch64/time.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/bsp.rs b/12_cpu_exceptions_part1/src/bsp.rs index 3db8e14a..2193a046 100644 --- a/12_cpu_exceptions_part1/src/bsp.rs +++ b/12_cpu_exceptions_part1/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/bsp/driver.rs b/12_cpu_exceptions_part1/src/bsp/driver.rs index c910274e..2c52ae61 100644 --- a/12_cpu_exceptions_part1/src/bsp/driver.rs +++ b/12_cpu_exceptions_part1/src/bsp/driver.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/bsp/driver/bcm.rs b/12_cpu_exceptions_part1/src/bsp/driver/bcm.rs index 16df7f3d..33383276 100644 --- a/12_cpu_exceptions_part1/src/bsp/driver/bcm.rs +++ b/12_cpu_exceptions_part1/src/bsp/driver/bcm.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/12_cpu_exceptions_part1/src/bsp/driver/bcm/bcm2xxx_gpio.rs index bc66bbcc..e6f5f7ca 100644 --- a/12_cpu_exceptions_part1/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ b/12_cpu_exceptions_part1/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs b/12_cpu_exceptions_part1/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs index 987a55cc..78471c3d 100644 --- a/12_cpu_exceptions_part1/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ b/12_cpu_exceptions_part1/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/bsp/rpi.rs b/12_cpu_exceptions_part1/src/bsp/rpi.rs index d59d76b7..27c6bc12 100644 --- a/12_cpu_exceptions_part1/src/bsp/rpi.rs +++ b/12_cpu_exceptions_part1/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/bsp/rpi/link.ld b/12_cpu_exceptions_part1/src/bsp/rpi/link.ld index 4ed0f152..5745d96d 100644 --- a/12_cpu_exceptions_part1/src/bsp/rpi/link.ld +++ b/12_cpu_exceptions_part1/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/12_cpu_exceptions_part1/src/bsp/rpi/memory_map.rs b/12_cpu_exceptions_part1/src/bsp/rpi/memory_map.rs index b223b26a..42615582 100644 --- a/12_cpu_exceptions_part1/src/bsp/rpi/memory_map.rs +++ b/12_cpu_exceptions_part1/src/bsp/rpi/memory_map.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/bsp/rpi/virt_mem_layout.rs b/12_cpu_exceptions_part1/src/bsp/rpi/virt_mem_layout.rs index 0c05aa6d..dedebc1d 100644 --- a/12_cpu_exceptions_part1/src/bsp/rpi/virt_mem_layout.rs +++ b/12_cpu_exceptions_part1/src/bsp/rpi/virt_mem_layout.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/interface.rs b/12_cpu_exceptions_part1/src/interface.rs index 24b3eb28..0d4a3a23 100644 --- a/12_cpu_exceptions_part1/src/interface.rs +++ b/12_cpu_exceptions_part1/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/main.rs b/12_cpu_exceptions_part1/src/main.rs index 8ea774c1..f053afea 100644 --- a/12_cpu_exceptions_part1/src/main.rs +++ b/12_cpu_exceptions_part1/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/memory.rs b/12_cpu_exceptions_part1/src/memory.rs index cd76c7ee..e9c21ab3 100644 --- a/12_cpu_exceptions_part1/src/memory.rs +++ b/12_cpu_exceptions_part1/src/memory.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/panic_wait.rs b/12_cpu_exceptions_part1/src/panic_wait.rs index a8d2cc48..6ae8488a 100644 --- a/12_cpu_exceptions_part1/src/panic_wait.rs +++ b/12_cpu_exceptions_part1/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/print.rs b/12_cpu_exceptions_part1/src/print.rs index 6e8a45b5..7bd8d6ef 100644 --- a/12_cpu_exceptions_part1/src/print.rs +++ b/12_cpu_exceptions_part1/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/12_cpu_exceptions_part1/src/runtime_init.rs b/12_cpu_exceptions_part1/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/12_cpu_exceptions_part1/src/runtime_init.rs +++ b/12_cpu_exceptions_part1/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 00000000..16fe87b0 --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/LICENSE b/LICENSE-MIT similarity index 58% rename from LICENSE rename to LICENSE-MIT index 38d6ab9b..642ebb7a 100644 --- a/LICENSE +++ b/LICENSE-MIT @@ -1,12 +1,13 @@ -Copyright (C) 2017 bzt (bztsrc@github) -Copyright (c) 2018-2019 Andre Richter +MIT License -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: +Copyright (C) 2018-2019 by the respective authors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/README.md b/README.md index f5d373c3..4f08a5eb 100644 --- a/README.md +++ b/README.md @@ -106,4 +106,15 @@ for giving me a head start! ## License -Licensed under the MIT license ([LICENSE-MIT](LICENSE) or http://opensource.org/licenses/MIT). +Licensed under either of + + * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. diff --git a/X1_JTAG_boot/Makefile b/X1_JTAG_boot/Makefile index 82355dcb..4cd43d9f 100644 --- a/X1_JTAG_boot/Makefile +++ b/X1_JTAG_boot/Makefile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/arch.rs b/X1_JTAG_boot/src/arch.rs index b1f035c5..ee958823 100644 --- a/X1_JTAG_boot/src/arch.rs +++ b/X1_JTAG_boot/src/arch.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/arch/aarch64.rs b/X1_JTAG_boot/src/arch/aarch64.rs index a44ece9b..305999b0 100644 --- a/X1_JTAG_boot/src/arch/aarch64.rs +++ b/X1_JTAG_boot/src/arch/aarch64.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/arch/aarch64/sync.rs b/X1_JTAG_boot/src/arch/aarch64/sync.rs index 2f6900b0..96ceff03 100644 --- a/X1_JTAG_boot/src/arch/aarch64/sync.rs +++ b/X1_JTAG_boot/src/arch/aarch64/sync.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/arch/aarch64/time.rs b/X1_JTAG_boot/src/arch/aarch64/time.rs index a6638976..d4fa88f1 100644 --- a/X1_JTAG_boot/src/arch/aarch64/time.rs +++ b/X1_JTAG_boot/src/arch/aarch64/time.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/bsp.rs b/X1_JTAG_boot/src/bsp.rs index 3db8e14a..2193a046 100644 --- a/X1_JTAG_boot/src/bsp.rs +++ b/X1_JTAG_boot/src/bsp.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/bsp/driver.rs b/X1_JTAG_boot/src/bsp/driver.rs index c910274e..2c52ae61 100644 --- a/X1_JTAG_boot/src/bsp/driver.rs +++ b/X1_JTAG_boot/src/bsp/driver.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/bsp/driver/bcm.rs b/X1_JTAG_boot/src/bsp/driver/bcm.rs index 16df7f3d..33383276 100644 --- a/X1_JTAG_boot/src/bsp/driver/bcm.rs +++ b/X1_JTAG_boot/src/bsp/driver/bcm.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/X1_JTAG_boot/src/bsp/driver/bcm/bcm2xxx_gpio.rs index 376a1318..e92ebd98 100644 --- a/X1_JTAG_boot/src/bsp/driver/bcm/bcm2xxx_gpio.rs +++ b/X1_JTAG_boot/src/bsp/driver/bcm/bcm2xxx_gpio.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs b/X1_JTAG_boot/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs index 987a55cc..78471c3d 100644 --- a/X1_JTAG_boot/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs +++ b/X1_JTAG_boot/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/bsp/rpi.rs b/X1_JTAG_boot/src/bsp/rpi.rs index 85fc4585..871c4b8b 100644 --- a/X1_JTAG_boot/src/bsp/rpi.rs +++ b/X1_JTAG_boot/src/bsp/rpi.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/bsp/rpi/link.ld b/X1_JTAG_boot/src/bsp/rpi/link.ld index 53b65640..2e3ba4f7 100644 --- a/X1_JTAG_boot/src/bsp/rpi/link.ld +++ b/X1_JTAG_boot/src/bsp/rpi/link.ld @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: MIT OR Apache-2.0 * * Copyright (c) 2018-2019 Andre Richter */ diff --git a/X1_JTAG_boot/src/bsp/rpi/memory_map.rs b/X1_JTAG_boot/src/bsp/rpi/memory_map.rs index ed617f5e..4176837b 100644 --- a/X1_JTAG_boot/src/bsp/rpi/memory_map.rs +++ b/X1_JTAG_boot/src/bsp/rpi/memory_map.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/interface.rs b/X1_JTAG_boot/src/interface.rs index b691d876..376be32c 100644 --- a/X1_JTAG_boot/src/interface.rs +++ b/X1_JTAG_boot/src/interface.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/main.rs b/X1_JTAG_boot/src/main.rs index 42cd5cfe..f2dc4537 100644 --- a/X1_JTAG_boot/src/main.rs +++ b/X1_JTAG_boot/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/panic_wait.rs b/X1_JTAG_boot/src/panic_wait.rs index a8d2cc48..6ae8488a 100644 --- a/X1_JTAG_boot/src/panic_wait.rs +++ b/X1_JTAG_boot/src/panic_wait.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/print.rs b/X1_JTAG_boot/src/print.rs index 6e8a45b5..7bd8d6ef 100644 --- a/X1_JTAG_boot/src/print.rs +++ b/X1_JTAG_boot/src/print.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/X1_JTAG_boot/src/runtime_init.rs b/X1_JTAG_boot/src/runtime_init.rs index 4cd0415a..7feda6b8 100644 --- a/X1_JTAG_boot/src/runtime_init.rs +++ b/X1_JTAG_boot/src/runtime_init.rs @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT OR Apache-2.0 // // Copyright (c) 2018-2019 Andre Richter diff --git a/docker/rustembedded-osdev-utils/Dockerfile b/docker/rustembedded-osdev-utils/Dockerfile index 2cce357c..155c412b 100644 --- a/docker/rustembedded-osdev-utils/Dockerfile +++ b/docker/rustembedded-osdev-utils/Dockerfile @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: MIT +## SPDX-License-Identifier: MIT OR Apache-2.0 ## ## Copyright (c) 2017-2019 Andre Richter ## Copyright (c) 2019 Nao Taco diff --git a/utils/clean_all.rb b/utils/clean_all.rb index f046e113..c086c661 100755 --- a/utils/clean_all.rb +++ b/utils/clean_all.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/clippy_all.rb b/utils/clippy_all.rb index 58e2f275..2db18978 100755 --- a/utils/clippy_all.rb +++ b/utils/clippy_all.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/diff_all.rb b/utils/diff_all.rb index 4df965f4..7062d83c 100755 --- a/utils/diff_all.rb +++ b/utils/diff_all.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/fmt_all.rb b/utils/fmt_all.rb index aa5ff4f8..d20ec323 100755 --- a/utils/fmt_all.rb +++ b/utils/fmt_all.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/helpers/copyrighted.rb b/utils/helpers/copyrighted.rb index 337b47ac..1c7e8d73 100644 --- a/utils/helpers/copyrighted.rb +++ b/utils/helpers/copyrighted.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/helpers/diff_tut_folders.bash b/utils/helpers/diff_tut_folders.bash index de2e1121..36a16e32 100755 --- a/utils/helpers/diff_tut_folders.bash +++ b/utils/helpers/diff_tut_folders.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/helpers/tutorial_folders.rb b/utils/helpers/tutorial_folders.rb index d96f5b74..3ea80324 100755 --- a/utils/helpers/tutorial_folders.rb +++ b/utils/helpers/tutorial_folders.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/make_all.rb b/utils/make_all.rb index 2e83f127..30c21dcc 100755 --- a/utils/make_all.rb +++ b/utils/make_all.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/raspboot.bash b/utils/raspboot.bash index 5b1e7f6f..85d53f49 100755 --- a/utils/raspboot.bash +++ b/utils/raspboot.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/ready_for_publish.rb b/utils/ready_for_publish.rb index 1103d13c..e9f9514c 100755 --- a/utils/ready_for_publish.rb +++ b/utils/ready_for_publish.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter diff --git a/utils/sanity_checks.rb b/utils/sanity_checks.rb index 045d42e8..fa7b3f95 100755 --- a/utils/sanity_checks.rb +++ b/utils/sanity_checks.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 # # Copyright (c) 2018-2019 Andre Richter