diff --git a/01_wait_forever/Cargo.toml b/01_wait_forever/Cargo.toml index 459866f8..c2815c32 100644 --- a/01_wait_forever/Cargo.toml +++ b/01_wait_forever/Cargo.toml @@ -20,4 +20,4 @@ path = "src/main.rs" ## Dependencies ##-------------------------------------------------------------------------------------------------- -[dependencies] +[dependencies] \ No newline at end of file diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile index 5e9debc5..cd5079d7 100644 --- a/01_wait_forever/Makefile +++ b/01_wait_forever/Makefile @@ -6,18 +6,18 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -49,9 +49,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -63,9 +63,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -100,9 +100,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu clippy clean readelf objdump nm check all: $(KERNEL_BIN) diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile index dd6080f9..6a62f276 100644 --- a/02_runtime_init/Makefile +++ b/02_runtime_init/Makefile @@ -6,18 +6,18 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -49,9 +49,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -63,9 +63,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -100,9 +100,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu clippy clean readelf objdump nm check all: $(KERNEL_BIN) diff --git a/02_runtime_init/README.md b/02_runtime_init/README.md index 2383b695..05ef98ba 100644 --- a/02_runtime_init/README.md +++ b/02_runtime_init/README.md @@ -41,7 +41,7 @@ diff -uNr 01_wait_forever/Cargo.toml 02_runtime_init/Cargo.toml edition = "2021" @@ -21,3 +21,7 @@ - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- [dependencies] + diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile index ed9cb8a4..3912b1bf 100644 --- a/03_hacky_hello_world/Makefile +++ b/03_hacky_hello_world/Makefile @@ -6,18 +6,18 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -49,9 +49,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -63,9 +63,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -103,9 +103,9 @@ DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -196,9 +196,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/03_hacky_hello_world/README.md b/03_hacky_hello_world/README.md index 8e5eca18..7aa5cbb7 100644 --- a/03_hacky_hello_world/README.md +++ b/03_hacky_hello_world/README.md @@ -101,9 +101,9 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile + + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Testing targets -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +.PHONY: test test_boot + +ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/04_safe_globals/Makefile b/04_safe_globals/Makefile index ed9cb8a4..3912b1bf 100644 --- a/04_safe_globals/Makefile +++ b/04_safe_globals/Makefile @@ -6,18 +6,18 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -49,9 +49,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -63,9 +63,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -103,9 +103,9 @@ DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -196,9 +196,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/05_drivers_gpio_uart/Makefile b/05_drivers_gpio_uart/Makefile index bc180f25..ae15cc88 100644 --- a/05_drivers_gpio_uart/Makefile +++ b/05_drivers_gpio_uart/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -52,9 +52,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -66,9 +66,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -115,9 +115,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu miniterm clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -215,9 +215,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/05_drivers_gpio_uart/README.md b/05_drivers_gpio_uart/README.md index 9db9df01..358bc256 100644 --- a/05_drivers_gpio_uart/README.md +++ b/05_drivers_gpio_uart/README.md @@ -195,7 +195,7 @@ diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile + - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- @@ -88,6 +91,7 @@ EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE) @@ -224,9 +224,9 @@ diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile + - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- ## Targets - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- -.PHONY: all doc qemu clippy clean readelf objdump nm check +.PHONY: all doc qemu miniterm clippy clean readelf objdump nm check diff --git a/06_uart_chainloader/Makefile b/06_uart_chainloader/Makefile index 139492f8..705835cc 100644 --- a/06_uart_chainloader/Makefile +++ b/06_uart_chainloader/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -54,9 +54,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -68,9 +68,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -117,9 +117,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -221,9 +221,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/06_uart_chainloader/README.md b/06_uart_chainloader/README.md index 6502d07b..75b9da9b 100644 --- a/06_uart_chainloader/README.md +++ b/06_uart_chainloader/README.md @@ -211,9 +211,9 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile @@ -118,7 +120,7 @@ - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- ## Targets - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- -.PHONY: all doc qemu miniterm clippy clean readelf objdump nm check +.PHONY: all doc qemu chainboot clippy clean readelf objdump nm check @@ -647,9 +647,9 @@ diff -uNr 05_drivers_gpio_uart/tests/chainboot_test.rb 06_uart_chainloader/tests + end +end + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Execution starts here -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +payload_path = ARGV.pop +qemu_cmd = ARGV.join(' ') + diff --git a/07_timestamps/Makefile b/07_timestamps/Makefile index f97db7f3..85f709a0 100644 --- a/07_timestamps/Makefile +++ b/07_timestamps/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -52,9 +52,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -66,9 +66,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -115,9 +115,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -215,9 +215,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/07_timestamps/README.md b/07_timestamps/README.md index e2c6ea0e..e2880214 100644 --- a/07_timestamps/README.md +++ b/07_timestamps/README.md @@ -961,9 +961,9 @@ diff -uNr 06_uart_chainloader/tests/chainboot_test.rb 07_timestamps/tests/chainb - end -end - --## ------------------------------------------------------------------------------------------------- +-##-------------------------------------------------------------------------------------------------- -## Execution starts here --## ------------------------------------------------------------------------------------------------- +-##-------------------------------------------------------------------------------------------------- -payload_path = ARGV.pop -qemu_cmd = ARGV.join(' ') - diff --git a/08_hw_debug_JTAG/Makefile b/08_hw_debug_JTAG/Makefile index 8b386adf..7c8eef4c 100644 --- a/08_hw_debug_JTAG/Makefile +++ b/08_hw_debug_JTAG/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -56,9 +56,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -70,9 +70,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -126,9 +126,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -226,9 +226,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -255,9 +255,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/08_hw_debug_JTAG/README.md b/08_hw_debug_JTAG/README.md index 8ea5b37d..b9c2c6cc 100644 --- a/08_hw_debug_JTAG/README.md +++ b/08_hw_debug_JTAG/README.md @@ -368,9 +368,9 @@ diff -uNr 07_timestamps/Makefile 08_hw_debug_JTAG/Makefile -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Debugging targets -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +.PHONY: jtagboot openocd gdb gdb-opt0 + +## ------------------------------------------------------------------------------ @@ -397,9 +397,9 @@ diff -uNr 07_timestamps/Makefile 08_hw_debug_JTAG/Makefile + + + - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- ## Testing targets - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- diff -uNr 07_timestamps/src/bsp/raspberrypi/driver.rs 08_hw_debug_JTAG/src/bsp/raspberrypi/driver.rs --- 07_timestamps/src/bsp/raspberrypi/driver.rs diff --git a/09_privilege_level/Makefile b/09_privilege_level/Makefile index 8b386adf..7c8eef4c 100644 --- a/09_privilege_level/Makefile +++ b/09_privilege_level/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -56,9 +56,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -70,9 +70,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -126,9 +126,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -226,9 +226,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -255,9 +255,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/10_virtual_mem_part1_identity_mapping/Makefile b/10_virtual_mem_part1_identity_mapping/Makefile index 8b386adf..7c8eef4c 100644 --- a/10_virtual_mem_part1_identity_mapping/Makefile +++ b/10_virtual_mem_part1_identity_mapping/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -56,9 +56,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -70,9 +70,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -126,9 +126,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -226,9 +226,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -255,9 +255,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/11_exceptions_part1_groundwork/Makefile b/11_exceptions_part1_groundwork/Makefile index 8b386adf..7c8eef4c 100644 --- a/11_exceptions_part1_groundwork/Makefile +++ b/11_exceptions_part1_groundwork/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -56,9 +56,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -70,9 +70,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -126,9 +126,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -226,9 +226,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -255,9 +255,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/12_integrated_testing/Makefile b/12_integrated_testing/Makefile index 1be5e0bd..4e352123 100644 --- a/12_integrated_testing/Makefile +++ b/12_integrated_testing/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -79,9 +79,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -136,9 +136,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -238,9 +238,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -267,9 +267,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/13_exceptions_part2_peripheral_IRQs/Makefile b/13_exceptions_part2_peripheral_IRQs/Makefile index 1be5e0bd..4e352123 100644 --- a/13_exceptions_part2_peripheral_IRQs/Makefile +++ b/13_exceptions_part2_peripheral_IRQs/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -79,9 +79,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -136,9 +136,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -238,9 +238,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -267,9 +267,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/14_virtual_mem_part2_mmio_remap/Makefile b/14_virtual_mem_part2_mmio_remap/Makefile index 1be5e0bd..4e352123 100644 --- a/14_virtual_mem_part2_mmio_remap/Makefile +++ b/14_virtual_mem_part2_mmio_remap/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -79,9 +79,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -136,9 +136,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -238,9 +238,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -267,9 +267,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/15_virtual_mem_part3_precomputed_tables/Makefile b/15_virtual_mem_part3_precomputed_tables/Makefile index a472a1e8..f2b79fbe 100644 --- a/15_virtual_mem_part3_precomputed_tables/Makefile +++ b/15_virtual_mem_part3_precomputed_tables/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -89,9 +89,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -147,9 +147,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -257,9 +257,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -286,9 +286,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml b/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml index 0785aba7..a0652b4f 100644 --- a/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml +++ b/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml @@ -10,9 +10,9 @@ bsp_rpi3 = ["tock-registers"] bsp_rpi4 = ["tock-registers"] test_build = ["qemu-exit"] -## ------------------------------------------------------------------------------------------------- +##------------------------------------------------------------------------------------------------- ## Dependencies -## ------------------------------------------------------------------------------------------------- +##------------------------------------------------------------------------------------------------- [dependencies] test-types = { path = "../libraries/test-types" } @@ -25,9 +25,9 @@ qemu-exit = { version = "3.x.x", optional = true } [target.'cfg(target_arch = "aarch64")'.dependencies] aarch64-cpu = { version = "9.x.x" } -## ------------------------------------------------------------------------------------------------- +##------------------------------------------------------------------------------------------------- ## Testing -## ------------------------------------------------------------------------------------------------- +##------------------------------------------------------------------------------------------------- [dev-dependencies] test-macros = { path = "../libraries/test-macros" } diff --git a/16_virtual_mem_part4_higher_half_kernel/Makefile b/16_virtual_mem_part4_higher_half_kernel/Makefile index a472a1e8..f2b79fbe 100644 --- a/16_virtual_mem_part4_higher_half_kernel/Makefile +++ b/16_virtual_mem_part4_higher_half_kernel/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -89,9 +89,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -147,9 +147,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -257,9 +257,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -286,9 +286,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/17_kernel_symbols/Makefile b/17_kernel_symbols/Makefile index cc74a8ef..4c97eb9a 100644 --- a/17_kernel_symbols/Makefile +++ b/17_kernel_symbols/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -106,9 +106,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES_SYMS) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -164,9 +164,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -281,9 +281,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -310,9 +310,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/17_kernel_symbols/README.md b/17_kernel_symbols/README.md index 934b1aa1..04828703 100644 --- a/17_kernel_symbols/README.md +++ b/17_kernel_symbols/README.md @@ -465,9 +465,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols/Cargo.toml 17_k +default = [] +generated_symbols_available = [] + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Dependencies -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- + +[dependencies] +debug-symbol-types = { path = "../libraries/debug-symbol-types" } @@ -524,9 +524,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols.mk 17_kernel_sy +include ../common/format.mk +include ../common/docker.mk + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Check for input variables that need be exported by the calling Makefile -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +ifndef KERNEL_SYMBOLS_TOOL_PATH +$(error KERNEL_SYMBOLS_TOOL_PATH is not set) +endif @@ -545,9 +545,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols.mk 17_kernel_sy + + + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Targets and Prerequisites -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml +KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld + @@ -562,9 +562,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols.mk 17_kernel_sy + + + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Command building blocks -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ + --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) + @@ -595,9 +595,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols.mk 17_kernel_sy + + + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Targets -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +.PHONY: all symbols measure_time_start measure_time_finish + +all: measure_time_start symbols measure_time_finish diff --git a/17_kernel_symbols/kernel_symbols.mk b/17_kernel_symbols/kernel_symbols.mk index 78eef39c..4f3647c5 100644 --- a/17_kernel_symbols/kernel_symbols.mk +++ b/17_kernel_symbols/kernel_symbols.mk @@ -5,9 +5,9 @@ include ../common/format.mk include ../common/docker.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Check for input variables that need be exported by the calling Makefile -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ifndef KERNEL_SYMBOLS_TOOL_PATH $(error KERNEL_SYMBOLS_TOOL_PATH is not set) endif @@ -26,9 +26,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld @@ -43,9 +43,9 @@ export KERNEL_SYMBOLS_DEMANGLED_RS -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) @@ -76,9 +76,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all symbols measure_time_start measure_time_finish all: measure_time_start symbols measure_time_finish diff --git a/18_backtrace/Makefile b/18_backtrace/Makefile index 714ad0e9..7fb52907 100644 --- a/18_backtrace/Makefile +++ b/18_backtrace/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -106,9 +106,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES_SYMS) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -166,9 +166,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -283,9 +283,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -311,9 +311,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/18_backtrace/README.md b/18_backtrace/README.md index 6c9157d5..6c3fda77 100644 --- a/18_backtrace/README.md +++ b/18_backtrace/README.md @@ -1039,9 +1039,9 @@ diff -uNr 17_kernel_symbols/kernel/tests/05_backtrace_sanity.rb 18_backtrace/ker + end +end + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Test registration -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +def subtest_collection + [PanicBacktraceTest.new, BacktraceCorrectnessTest.new] +end @@ -1106,9 +1106,9 @@ diff -uNr 17_kernel_symbols/kernel/tests/06_backtrace_invalid_frame.rb 18_backtr + end +end + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Test registration -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +def subtest_collection + [InvalidFramePointerTest.new] +end @@ -1174,9 +1174,9 @@ diff -uNr 17_kernel_symbols/kernel/tests/07_backtrace_invalid_link.rb 18_backtra + end +end + -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +## Test registration -+## ------------------------------------------------------------------------------------------------- ++##-------------------------------------------------------------------------------------------------- +def subtest_collection + [InvalidLinkTest.new] +end diff --git a/18_backtrace/kernel_symbols.mk b/18_backtrace/kernel_symbols.mk index 78eef39c..4f3647c5 100644 --- a/18_backtrace/kernel_symbols.mk +++ b/18_backtrace/kernel_symbols.mk @@ -5,9 +5,9 @@ include ../common/format.mk include ../common/docker.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Check for input variables that need be exported by the calling Makefile -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ifndef KERNEL_SYMBOLS_TOOL_PATH $(error KERNEL_SYMBOLS_TOOL_PATH is not set) endif @@ -26,9 +26,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld @@ -43,9 +43,9 @@ export KERNEL_SYMBOLS_DEMANGLED_RS -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) @@ -76,9 +76,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all symbols measure_time_start measure_time_finish all: measure_time_start symbols measure_time_finish diff --git a/19_kernel_heap/Makefile b/19_kernel_heap/Makefile index 393bc3bd..e97e3fbb 100644 --- a/19_kernel_heap/Makefile +++ b/19_kernel_heap/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -30,9 +30,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -70,9 +70,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP)_$(DEBUG_PRINTS).build_config @@ -111,9 +111,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES_SYMS) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -171,9 +171,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -288,9 +288,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -316,9 +316,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/19_kernel_heap/README.md b/19_kernel_heap/README.md index 97611794..eedf82c7 100644 --- a/19_kernel_heap/README.md +++ b/19_kernel_heap/README.md @@ -1439,7 +1439,7 @@ diff -uNr 18_backtrace/Makefile 19_kernel_heap/Makefile ifdef TEST TEST_ARG = --test $(TEST) @@ -70,7 +75,7 @@ - ## ------------------------------------------------------------------------------------------------- + ##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld -LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/19_kernel_heap/kernel_symbols.mk b/19_kernel_heap/kernel_symbols.mk index 78eef39c..4f3647c5 100644 --- a/19_kernel_heap/kernel_symbols.mk +++ b/19_kernel_heap/kernel_symbols.mk @@ -5,9 +5,9 @@ include ../common/format.mk include ../common/docker.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Check for input variables that need be exported by the calling Makefile -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ifndef KERNEL_SYMBOLS_TOOL_PATH $(error KERNEL_SYMBOLS_TOOL_PATH is not set) endif @@ -26,9 +26,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld @@ -43,9 +43,9 @@ export KERNEL_SYMBOLS_DEMANGLED_RS -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) @@ -76,9 +76,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all symbols measure_time_start measure_time_finish all: measure_time_start symbols measure_time_finish diff --git a/20_timer_callbacks/Makefile b/20_timer_callbacks/Makefile index 393bc3bd..e97e3fbb 100644 --- a/20_timer_callbacks/Makefile +++ b/20_timer_callbacks/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -30,9 +30,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -70,9 +70,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP)_$(DEBUG_PRINTS).build_config @@ -111,9 +111,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES_SYMS) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -171,9 +171,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -288,9 +288,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Debugging targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -316,9 +316,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/20_timer_callbacks/kernel/Cargo.toml b/20_timer_callbacks/kernel/Cargo.toml index 18b00e7a..4a3b76d3 100644 --- a/20_timer_callbacks/kernel/Cargo.toml +++ b/20_timer_callbacks/kernel/Cargo.toml @@ -11,9 +11,9 @@ bsp_rpi3 = ["tock-registers"] bsp_rpi4 = ["tock-registers"] test_build = ["qemu-exit"] -## ------------------------------------------------------------------------------------------------- +##------------------------------------------------------------------------------------------------- ## Dependencies -## ------------------------------------------------------------------------------------------------- +##------------------------------------------------------------------------------------------------- [dependencies] test-types = { path = "../libraries/test-types" } @@ -28,9 +28,9 @@ qemu-exit = { version = "3.x.x", optional = true } [target.'cfg(target_arch = "aarch64")'.dependencies] aarch64-cpu = { version = "9.x.x" } -## ------------------------------------------------------------------------------------------------- +##------------------------------------------------------------------------------------------------- ## Testing -## ------------------------------------------------------------------------------------------------- +##------------------------------------------------------------------------------------------------- [dev-dependencies] test-macros = { path = "../libraries/test-macros" } diff --git a/20_timer_callbacks/kernel_symbols.mk b/20_timer_callbacks/kernel_symbols.mk index 78eef39c..4f3647c5 100644 --- a/20_timer_callbacks/kernel_symbols.mk +++ b/20_timer_callbacks/kernel_symbols.mk @@ -5,9 +5,9 @@ include ../common/format.mk include ../common/docker.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Check for input variables that need be exported by the calling Makefile -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ifndef KERNEL_SYMBOLS_TOOL_PATH $(error KERNEL_SYMBOLS_TOOL_PATH is not set) endif @@ -26,9 +26,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld @@ -43,9 +43,9 @@ export KERNEL_SYMBOLS_DEMANGLED_RS -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) @@ -76,9 +76,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all symbols measure_time_start measure_time_finish all: measure_time_start symbols measure_time_finish diff --git a/X1_JTAG_boot/Cargo.toml b/X1_JTAG_boot/Cargo.toml index f6251c8f..e310c371 100644 --- a/X1_JTAG_boot/Cargo.toml +++ b/X1_JTAG_boot/Cargo.toml @@ -16,9 +16,9 @@ bsp_rpi4 = ["tock-registers"] name = "kernel" path = "src/main.rs" -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Dependencies -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- [dependencies] diff --git a/X1_JTAG_boot/Makefile b/X1_JTAG_boot/Makefile index f97db7f3..85f709a0 100644 --- a/X1_JTAG_boot/Makefile +++ b/X1_JTAG_boot/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -52,9 +52,9 @@ export LD_SCRIPT_PATH -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -66,9 +66,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Command building blocks -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -115,9 +115,9 @@ endif -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -215,9 +215,9 @@ nm: $(KERNEL_ELF) -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- ## Testing targets -## ------------------------------------------------------------------------------------------------- +##-------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board.