diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile index 6f95ee1e..581b753c 100644 --- a/01_wait_forever/Makefile +++ b/01_wait_forever/Makefile @@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile index 6f95ee1e..581b753c 100644 --- a/02_runtime_init/Makefile +++ b/02_runtime_init/Makefile @@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile index fc6078fb..d642135b 100644 --- a/03_hacky_hello_world/Makefile +++ b/03_hacky_hello_world/Makefile @@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/04_zero_overhead_abstraction/Makefile b/04_zero_overhead_abstraction/Makefile index fc6078fb..d642135b 100644 --- a/04_zero_overhead_abstraction/Makefile +++ b/04_zero_overhead_abstraction/Makefile @@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/05_safe_globals/Makefile b/05_safe_globals/Makefile index fc6078fb..d642135b 100644 --- a/05_safe_globals/Makefile +++ b/05_safe_globals/Makefile @@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/06_drivers_gpio_uart/Makefile b/06_drivers_gpio_uart/Makefile index fc6078fb..d642135b 100644 --- a/06_drivers_gpio_uart/Makefile +++ b/06_drivers_gpio_uart/Makefile @@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/07_uart_chainloader/Makefile b/07_uart_chainloader/Makefile index 002f429b..691952fb 100644 --- a/07_uart_chainloader/Makefile +++ b/07_uart_chainloader/Makefile @@ -48,9 +48,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/07_uart_chainloader/README.md b/07_uart_chainloader/README.md index 57f92a96..c80e1212 100644 --- a/07_uart_chainloader/README.md +++ b/07_uart_chainloader/README.md @@ -23,7 +23,7 @@ You can try it with this tutorial already: > ❗ **NOTE**: By default, `make chainboot` tries to connect to `/dev/ttyUSB0`. > Should the USB serial on your system have a different name, you have to provide it explicitly. For -> exmaple: +> example: > > `DEV_SERIAL=/dev/tty.usbserial-0001 make chainboot` @@ -129,7 +129,7 @@ diff -uNr 06_drivers_gpio_uart/Makefile 07_uart_chainloader/Makefile endif SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld) -@@ -47,12 +57,22 @@ +@@ -46,12 +56,22 @@ DOCKER_IMAGE = rustembedded/osdev-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work/tutorial -w /work/tutorial @@ -153,7 +153,7 @@ diff -uNr 06_drivers_gpio_uart/Makefile 07_uart_chainloader/Makefile all: clean $(OUTPUT) -@@ -69,11 +89,20 @@ +@@ -68,11 +88,20 @@ ifeq ($(QEMU_MACHINE_TYPE),) qemu: @echo "This board is not yet supported for QEMU." diff --git a/08_timestamps/Makefile b/08_timestamps/Makefile index d6a15d6b..d4cea8bd 100644 --- a/08_timestamps/Makefile +++ b/08_timestamps/Makefile @@ -46,9 +46,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/08_timestamps/README.md b/08_timestamps/README.md index 791e0fe9..8fea0c6e 100644 --- a/08_timestamps/README.md +++ b/08_timestamps/README.md @@ -66,7 +66,7 @@ diff -uNr 07_uart_chainloader/Makefile 08_timestamps/Makefile endif SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld) -@@ -72,7 +70,7 @@ +@@ -71,7 +69,7 @@ EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE) EXEC_MINIPUSH = ruby ../utils/minipush.rb @@ -75,7 +75,7 @@ diff -uNr 07_uart_chainloader/Makefile 08_timestamps/Makefile all: clean $(OUTPUT) -@@ -89,19 +87,13 @@ +@@ -88,19 +86,13 @@ ifeq ($(QEMU_MACHINE_TYPE),) qemu: @echo "This board is not yet supported for QEMU." diff --git a/09_hw_debug_JTAG/Makefile b/09_hw_debug_JTAG/Makefile index d85d3798..66f6722e 100644 --- a/09_hw_debug_JTAG/Makefile +++ b/09_hw_debug_JTAG/Makefile @@ -50,9 +50,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/09_hw_debug_JTAG/README.md b/09_hw_debug_JTAG/README.md index 92146a42..03e4c3ef 100644 --- a/09_hw_debug_JTAG/README.md +++ b/09_hw_debug_JTAG/README.md @@ -323,7 +323,7 @@ diff -uNr 08_timestamps/Makefile 09_hw_debug_JTAG/Makefile LINKER_FILE = src/bsp/raspberrypi/link.ld RUSTC_MISC_ARGS = -C target-cpu=cortex-a72 endif -@@ -56,21 +60,28 @@ +@@ -55,21 +59,28 @@ DOCKER_IMAGE = rustembedded/osdev-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work/tutorial -w /work/tutorial DOCKER_ARG_DIR_UTILS = -v $(shell pwd)/../utils:/work/utils @@ -353,7 +353,7 @@ diff -uNr 08_timestamps/Makefile 09_hw_debug_JTAG/Makefile all: clean $(OUTPUT) -@@ -95,6 +106,24 @@ +@@ -94,6 +105,24 @@ chainboot: all @$(DOCKER_CHAINBOOT) $(EXEC_MINIPUSH) $(DEV_SERIAL) $(OUTPUT) diff --git a/10_privilege_level/Makefile b/10_privilege_level/Makefile index d85d3798..66f6722e 100644 --- a/10_privilege_level/Makefile +++ b/10_privilege_level/Makefile @@ -50,9 +50,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/11_virtual_memory/Makefile b/11_virtual_memory/Makefile index d85d3798..66f6722e 100644 --- a/11_virtual_memory/Makefile +++ b/11_virtual_memory/Makefile @@ -50,9 +50,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/12_exceptions_part1_groundwork/Makefile b/12_exceptions_part1_groundwork/Makefile index d85d3798..66f6722e 100644 --- a/12_exceptions_part1_groundwork/Makefile +++ b/12_exceptions_part1_groundwork/Makefile @@ -50,9 +50,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/13_integrated_testing/Makefile b/13_integrated_testing/Makefile index d60a752a..d535b926 100644 --- a/13_integrated_testing/Makefile +++ b/13_integrated_testing/Makefile @@ -64,9 +64,8 @@ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) TEST_CMD = cargo test $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/13_integrated_testing/README.md b/13_integrated_testing/README.md index c479291a..d730a826 100644 --- a/13_integrated_testing/README.md +++ b/13_integrated_testing/README.md @@ -857,10 +857,10 @@ diff -uNr 12_exceptions_part1_groundwork/Makefile 13_integrated_testing/Makefile DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) +TEST_CMD = cargo test $(COMPILER_ARGS) - OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ -@@ -58,18 +72,20 @@ + OBJCOPY_CMD = rust-objcopy \ + --strip-all \ + -O binary +@@ -57,18 +71,20 @@ KERNEL_ELF = target/$(TARGET)/release/kernel DOCKER_IMAGE = rustembedded/osdev-utils @@ -885,7 +885,7 @@ diff -uNr 12_exceptions_part1_groundwork/Makefile 13_integrated_testing/Makefile DOCKER_CHAINBOOT = $(DOCKER_CMD_DEV) $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE) DOCKER_JTAGBOOT = $(DOCKER_CMD_DEV) $(DOCKER_ARG_DIR_UTILS) $(DOCKER_ARG_DIR_JTAG) $(DOCKER_IMAGE) -@@ -81,7 +97,7 @@ +@@ -80,7 +96,7 @@ EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE) EXEC_MINIPUSH = ruby ../utils/minipush.rb @@ -894,7 +894,7 @@ diff -uNr 12_exceptions_part1_groundwork/Makefile 13_integrated_testing/Makefile all: clean $(OUTPUT) -@@ -97,10 +113,28 @@ +@@ -96,10 +112,28 @@ ifeq ($(QEMU_MACHINE_TYPE),) qemu: diff --git a/14_exceptions_part2_peripheral_IRQs/Makefile b/14_exceptions_part2_peripheral_IRQs/Makefile index cbbde5e0..6b8f3b2c 100644 --- a/14_exceptions_part2_peripheral_IRQs/Makefile +++ b/14_exceptions_part2_peripheral_IRQs/Makefile @@ -65,9 +65,8 @@ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) TEST_CMD = cargo test $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel diff --git a/14_exceptions_part2_peripheral_IRQs/README.md b/14_exceptions_part2_peripheral_IRQs/README.md index fc1bad5d..ddb06767 100644 --- a/14_exceptions_part2_peripheral_IRQs/README.md +++ b/14_exceptions_part2_peripheral_IRQs/README.md @@ -773,7 +773,7 @@ diff -uNr 13_integrated_testing/Makefile 14_exceptions_part2_peripheral_IRQs/Mak --release RUSTC_CMD = cargo rustc $(COMPILER_ARGS) -@@ -94,8 +95,8 @@ +@@ -93,8 +94,8 @@ DOCKER_OPENOCD = echo "Not yet supported on non-Linux systems."; \# endif @@ -784,7 +784,7 @@ diff -uNr 13_integrated_testing/Makefile 14_exceptions_part2_peripheral_IRQs/Mak .PHONY: all doc qemu chainboot jtagboot openocd gdb gdb-opt0 clippy clean readelf objdump nm test -@@ -111,6 +112,7 @@ +@@ -110,6 +111,7 @@ doc: $(DOC_CMD) --document-private-items --open @@ -792,7 +792,7 @@ diff -uNr 13_integrated_testing/Makefile 14_exceptions_part2_peripheral_IRQs/Mak ifeq ($(QEMU_MACHINE_TYPE),) qemu: @echo $(QEMU_MISSING_STRING) -@@ -130,6 +132,7 @@ +@@ -129,6 +131,7 @@ endef export KERNEL_TEST_RUNNER diff --git a/X1_JTAG_boot/Makefile b/X1_JTAG_boot/Makefile index d6a15d6b..d4cea8bd 100644 --- a/X1_JTAG_boot/Makefile +++ b/X1_JTAG_boot/Makefile @@ -46,9 +46,8 @@ COMPILER_ARGS = --target=$(TARGET) \ RUSTC_CMD = cargo rustc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) -OBJCOPY_CMD = cargo objcopy \ - -- \ - --strip-all \ +OBJCOPY_CMD = rust-objcopy \ + --strip-all \ -O binary KERNEL_ELF = target/$(TARGET)/release/kernel