Archives
/
rust-raspberrypi-OS-tutorials
mirror of https://github.com/rust-embedded/rust-raspberrypi-OS-tutorials
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix objcopy invocation

Browse Source
pull/54/head
Andre Richter 5 years ago
parent 834b226f4e
commit 6eb9613ba2
No known key found for this signature in database
GPG Key ID: 2116C1AB102F615E
20 changed files with 46 additions and 61 deletions
Show Stats Download Patch File Download Diff File

5
01_wait_forever/Makefile
Unescape Escape View File

@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
02_runtime_init/Makefile
Unescape Escape View File

@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
03_hacky_hello_world/Makefile
Unescape Escape View File

@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
04_zero_overhead_abstraction/Makefile
Unescape Escape View File

@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
05_safe_globals/Makefile
Unescape Escape View File

@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
06_drivers_gpio_uart/Makefile
Unescape Escape View File

@ -38,9 +38,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
07_uart_chainloader/Makefile
Unescape Escape View File

@ -48,9 +48,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

6
07_uart_chainloader/README.md
Unescape Escape View File

@ -23,7 +23,7 @@ You can try it with this tutorial already:
> ❗ **NOTE**: By default, `make chainboot` tries to connect to `/dev/ttyUSB0`. > ❗ **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 > 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` > `DEV_SERIAL=/dev/tty.usbserial-0001 make chainboot`
@ -129,7 +129,7 @@ diff -uNr 06_drivers_gpio_uart/Makefile 07_uart_chainloader/Makefile
endif endif
SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld) SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld)
@@ -47,12 +57,22 @@ @@ -46,12 +56,22 @@
DOCKER_IMAGE = rustembedded/osdev-utils DOCKER_IMAGE = rustembedded/osdev-utils
DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work/tutorial -w /work/tutorial 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) all: clean $(OUTPUT)
@@ -69,11 +89,20 @@ @@ -68,11 +88,20 @@
ifeq ($(QEMU_MACHINE_TYPE),) ifeq ($(QEMU_MACHINE_TYPE),)
qemu: qemu:
@echo "This board is not yet supported for QEMU." @echo "This board is not yet supported for QEMU."

5
08_timestamps/Makefile
Unescape Escape View File

@ -46,9 +46,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

4
08_timestamps/README.md
Unescape Escape View File

@ -66,7 +66,7 @@ diff -uNr 07_uart_chainloader/Makefile 08_timestamps/Makefile
endif endif
SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld) SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld)
@@ -72,7 +70,7 @@ @@ -71,7 +69,7 @@
EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE) EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
EXEC_MINIPUSH = ruby ../utils/minipush.rb EXEC_MINIPUSH = ruby ../utils/minipush.rb
@ -75,7 +75,7 @@ diff -uNr 07_uart_chainloader/Makefile 08_timestamps/Makefile
all: clean $(OUTPUT) all: clean $(OUTPUT)
@@ -89,19 +87,13 @@ @@ -88,19 +86,13 @@
ifeq ($(QEMU_MACHINE_TYPE),) ifeq ($(QEMU_MACHINE_TYPE),)
qemu: qemu:
@echo "This board is not yet supported for QEMU." @echo "This board is not yet supported for QEMU."

5
09_hw_debug_JTAG/Makefile
Unescape Escape View File

@ -50,9 +50,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

4
09_hw_debug_JTAG/README.md
Unescape Escape View File

@ -323,7 +323,7 @@ diff -uNr 08_timestamps/Makefile 09_hw_debug_JTAG/Makefile
LINKER_FILE = src/bsp/raspberrypi/link.ld LINKER_FILE = src/bsp/raspberrypi/link.ld
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72 RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
endif endif
@@ -56,21 +60,28 @@ @@ -55,21 +59,28 @@
DOCKER_IMAGE = rustembedded/osdev-utils DOCKER_IMAGE = rustembedded/osdev-utils
DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work/tutorial -w /work/tutorial DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
DOCKER_ARG_DIR_UTILS = -v $(shell pwd)/../utils:/work/utils 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) all: clean $(OUTPUT)
@@ -95,6 +106,24 @@ @@ -94,6 +105,24 @@
chainboot: all chainboot: all
@$(DOCKER_CHAINBOOT) $(EXEC_MINIPUSH) $(DEV_SERIAL) $(OUTPUT) @$(DOCKER_CHAINBOOT) $(EXEC_MINIPUSH) $(DEV_SERIAL) $(OUTPUT)

5
10_privilege_level/Makefile
Unescape Escape View File

@ -50,9 +50,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
11_virtual_memory/Makefile
Unescape Escape View File

@ -50,9 +50,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
12_exceptions_part1_groundwork/Makefile
Unescape Escape View File

@ -50,9 +50,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

5
13_integrated_testing/Makefile
Unescape Escape View File

@ -64,9 +64,8 @@ RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
TEST_CMD = cargo test $(COMPILER_ARGS) TEST_CMD = cargo test $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

12
13_integrated_testing/README.md
Unescape Escape View File

@ -857,10 +857,10 @@ diff -uNr 12_exceptions_part1_groundwork/Makefile 13_integrated_testing/Makefile
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
+TEST_CMD = cargo test $(COMPILER_ARGS) +TEST_CMD = cargo test $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \ -O binary
@@ -58,18 +72,20 @@ @@ -57,18 +71,20 @@
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel
DOCKER_IMAGE = rustembedded/osdev-utils 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_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) 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_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
EXEC_MINIPUSH = ruby ../utils/minipush.rb EXEC_MINIPUSH = ruby ../utils/minipush.rb
@ -894,7 +894,7 @@ diff -uNr 12_exceptions_part1_groundwork/Makefile 13_integrated_testing/Makefile
all: clean $(OUTPUT) all: clean $(OUTPUT)
@@ -97,10 +113,28 @@ @@ -96,10 +112,28 @@
ifeq ($(QEMU_MACHINE_TYPE),) ifeq ($(QEMU_MACHINE_TYPE),)
qemu: qemu:

5
14_exceptions_part2_peripheral_IRQs/Makefile
Unescape Escape View File

@ -65,9 +65,8 @@ RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
TEST_CMD = cargo test $(COMPILER_ARGS) TEST_CMD = cargo test $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

6
14_exceptions_part2_peripheral_IRQs/README.md
Unescape Escape View File

@ -773,7 +773,7 @@ diff -uNr 13_integrated_testing/Makefile 14_exceptions_part2_peripheral_IRQs/Mak
--release --release
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
@@ -94,8 +95,8 @@ @@ -93,8 +94,8 @@
DOCKER_OPENOCD = echo "Not yet supported on non-Linux systems."; \# DOCKER_OPENOCD = echo "Not yet supported on non-Linux systems."; \#
endif 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 .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:
$(DOC_CMD) --document-private-items --open $(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),) ifeq ($(QEMU_MACHINE_TYPE),)
qemu: qemu:
@echo $(QEMU_MISSING_STRING) @echo $(QEMU_MISSING_STRING)
@@ -130,6 +132,7 @@ @@ -129,6 +131,7 @@
endef endef
export KERNEL_TEST_RUNNER export KERNEL_TEST_RUNNER

5
X1_JTAG_boot/Makefile
Unescape Escape View File

@ -46,9 +46,8 @@ COMPILER_ARGS = --target=$(TARGET) \
RUSTC_CMD = cargo rustc $(COMPILER_ARGS) RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
DOC_CMD = cargo doc $(COMPILER_ARGS) DOC_CMD = cargo doc $(COMPILER_ARGS)
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS) CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
OBJCOPY_CMD = cargo objcopy \ OBJCOPY_CMD = rust-objcopy \
-- \ --strip-all \
--strip-all \
-O binary -O binary
KERNEL_ELF = target/$(TARGET)/release/kernel KERNEL_ELF = target/$(TARGET)/release/kernel

Write Preview
Loading…
Cancel
Save