Skip to content

Commit dee575b

Browse files
andre-richterandre-richter
committed
Bump QEMU to 6.1; Tag Docker images from now on
1 parent 431b18d commit dee575b

File tree

30 files changed

+98
-78
lines changed

30 files changed

+98
-78
lines changed

‎01_wait_forever/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
##
33
## Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
44

5-
include ../common/color.mk.in
5+
include ../common/color.mk
6+
include ../common/docker.mk
67

78
##--------------------------------------------------------------------------------------------------
89
## Optional, user-provided configuration values
@@ -75,10 +76,10 @@ EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
7576
##------------------------------------------------------------------------------
7677
## Dockerization
7778
##------------------------------------------------------------------------------
78-
DOCKER_IMAGE = rustembedded/osdev-utils
7979
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8080
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
8181

82+
# DOCKER_IMAGE defined in include file (see top of this file).
8283
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
8384
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
8485

‎02_runtime_init/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
##
33
## Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
44

5-
include ../common/color.mk.in
5+
include ../common/color.mk
6+
include ../common/docker.mk
67

78
##--------------------------------------------------------------------------------------------------
89
## Optional, user-provided configuration values
@@ -75,10 +76,10 @@ EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
7576
##------------------------------------------------------------------------------
7677
## Dockerization
7778
##------------------------------------------------------------------------------
78-
DOCKER_IMAGE = rustembedded/osdev-utils
7979
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8080
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
8181

82+
# DOCKER_IMAGE defined in include file (see top of this file).
8283
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
8384
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
8485

‎02_runtime_init/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ diff -uNr 01_wait_forever/Cargo.toml 02_runtime_init/Cargo.toml
5353
diff -uNr 01_wait_forever/Makefile 02_runtime_init/Makefile
5454
--- 01_wait_forever/Makefile
5555
+++ 02_runtime_init/Makefile
56-
@@ -152,6 +152,8 @@
56+
@@ -153,6 +153,8 @@
5757
$(call colorecho, "\nLaunching objdump")
5858
@$(DOCKER_TOOLS) $(OBJDUMP_BINARY) --disassemble --demangle \
5959
--section .text \

‎03_hacky_hello_world/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
##
33
## Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
44

5-
include ../common/color.mk.in
5+
include ../common/color.mk
6+
include ../common/docker.mk
67

78
##--------------------------------------------------------------------------------------------------
89
## Optional, user-provided configuration values
@@ -76,11 +77,11 @@ EXEC_TEST_DISPATCH = ruby ../common/tests/dispatch.rb
7677
##------------------------------------------------------------------------------
7778
## Dockerization
7879
##------------------------------------------------------------------------------
79-
DOCKER_IMAGE = rustembedded/osdev-utils
8080
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8181
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
8282
DOCKER_ARG_DIR_COMMON = -v $(shell pwd)/../common:/work/common
8383

84+
# DOCKER_IMAGE defined in include file (see top of this file).
8485
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
8586
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
8687
DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE)

‎03_hacky_hello_world/README.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ diff -uNr 02_runtime_init/Cargo.toml 03_hacky_hello_world/Cargo.toml
4747
diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
4848
--- 02_runtime_init/Makefile
4949
+++ 03_hacky_hello_world/Makefile
50-
@@ -23,7 +23,7 @@
50+
@@ -24,7 +24,7 @@
5151
KERNEL_BIN = kernel8.img
5252
QEMU_BINARY = qemu-system-aarch64
5353
QEMU_MACHINE_TYPE = raspi3
@@ -56,7 +56,7 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
5656
OBJDUMP_BINARY = aarch64-none-elf-objdump
5757
NM_BINARY = aarch64-none-elf-nm
5858
READELF_BINARY = aarch64-none-elf-readelf
59-
@@ -34,7 +34,7 @@
59+
@@ -35,7 +35,7 @@
6060
KERNEL_BIN = kernel8.img
6161
QEMU_BINARY = qemu-system-aarch64
6262
QEMU_MACHINE_TYPE =
@@ -65,7 +65,7 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
6565
OBJDUMP_BINARY = aarch64-none-elf-objdump
6666
NM_BINARY = aarch64-none-elf-nm
6767
READELF_BINARY = aarch64-none-elf-readelf
68-
@@ -70,17 +70,20 @@
68+
@@ -71,17 +71,20 @@
6969
--strip-all \
7070
-O binary
7171

@@ -76,21 +76,20 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
7676
##------------------------------------------------------------------------------
7777
## Dockerization
7878
##------------------------------------------------------------------------------
79-
-DOCKER_IMAGE = rustembedded/osdev-utils
8079
-DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8180
-DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
82-
+DOCKER_IMAGE = rustembedded/osdev-utils
8381
+DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8482
+DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
8583
+DOCKER_ARG_DIR_COMMON = -v $(shell pwd)/../common:/work/common
8684

85+
# DOCKER_IMAGE defined in include file (see top of this file).
8786
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
8887
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
8988
+DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE)
9089

9190

9291

93-
@@ -168,3 +171,28 @@
92+
@@ -169,3 +172,28 @@
9493
##------------------------------------------------------------------------------
9594
check:
9695
@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json

‎04_safe_globals/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
##
33
## Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
44

5-
include ../common/color.mk.in
5+
include ../common/color.mk
6+
include ../common/docker.mk
67

78
##--------------------------------------------------------------------------------------------------
89
## Optional, user-provided configuration values
@@ -76,11 +77,11 @@ EXEC_TEST_DISPATCH = ruby ../common/tests/dispatch.rb
7677
##------------------------------------------------------------------------------
7778
## Dockerization
7879
##------------------------------------------------------------------------------
79-
DOCKER_IMAGE = rustembedded/osdev-utils
8080
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8181
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
8282
DOCKER_ARG_DIR_COMMON = -v $(shell pwd)/../common:/work/common
8383

84+
# DOCKER_IMAGE defined in include file (see top of this file).
8485
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
8586
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
8687
DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE)

‎05_drivers_gpio_uart/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
##
33
## Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
44

5-
include ../common/color.mk.in
5+
include ../common/color.mk
6+
include ../common/docker.mk
67

78
##--------------------------------------------------------------------------------------------------
89
## Optional, user-provided configuration values
@@ -80,12 +81,12 @@ EXEC_MINITERM = ruby ../common/serial/miniterm.rb
8081
##------------------------------------------------------------------------------
8182
## Dockerization
8283
##------------------------------------------------------------------------------
83-
DOCKER_IMAGE = rustembedded/osdev-utils
8484
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8585
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
8686
DOCKER_ARG_DIR_COMMON = -v $(shell pwd)/../common:/work/common
8787
DOCKER_ARG_DEV = --privileged -v /dev:/dev
8888

89+
# DOCKER_IMAGE defined in include file (see top of this file).
8990
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
9091
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
9192
DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE)

‎05_drivers_gpio_uart/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ diff -uNr 04_safe_globals/Cargo.toml 05_drivers_gpio_uart/Cargo.toml
145145
diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile
146146
--- 04_safe_globals/Makefile
147147
+++ 05_drivers_gpio_uart/Makefile
148-
@@ -11,6 +11,9 @@
148+
@@ -12,6 +12,9 @@
149149
# Default to the RPi3.
150150
BSP ?= rpi3
151151

@@ -155,20 +155,21 @@ diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile
155155

156156

157157
##--------------------------------------------------------------------------------------------------
158-
@@ -72,6 +75,7 @@
158+
@@ -73,6 +76,7 @@
159159

160160
EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
161161
EXEC_TEST_DISPATCH = ruby ../common/tests/dispatch.rb
162162
+EXEC_MINITERM = ruby ../common/serial/miniterm.rb
163163

164164
##------------------------------------------------------------------------------
165165
## Dockerization
166-
@@ -80,17 +84,25 @@
166+
@@ -80,18 +84,26 @@
167167
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
168168
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
169169
DOCKER_ARG_DIR_COMMON = -v $(shell pwd)/../common:/work/common
170170
+DOCKER_ARG_DEV = --privileged -v /dev:/dev
171171

172+
# DOCKER_IMAGE defined in include file (see top of this file).
172173
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
173174
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
174175
DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE)
@@ -190,7 +191,7 @@ diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile
190191

191192
all: $(KERNEL_BIN)
192193

193-
@@ -130,6 +142,12 @@
194+
@@ -131,6 +143,12 @@
194195
endif
195196

196197
##------------------------------------------------------------------------------

‎06_uart_chainloader/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
##
33
## Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
44

5-
include ../common/color.mk.in
5+
include ../common/color.mk
6+
include ../common/docker.mk
67

78
##--------------------------------------------------------------------------------------------------
89
## Optional, user-provided configuration values
@@ -82,12 +83,12 @@ EXEC_MINIPUSH = ruby ../common/serial/minipush.rb
8283
##------------------------------------------------------------------------------
8384
## Dockerization
8485
##------------------------------------------------------------------------------
85-
DOCKER_IMAGE = rustembedded/osdev-utils
8686
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8787
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
8888
DOCKER_ARG_DIR_COMMON = -v $(shell pwd)/../common:/work/common
8989
DOCKER_ARG_DEV = --privileged -v /dev:/dev
9090

91+
# DOCKER_IMAGE defined in include file (see top of this file).
9192
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
9293
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
9394
DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE)

‎06_uart_chainloader/README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Binary files 05_drivers_gpio_uart/demo_payload_rpi4.img and 06_uart_chainloader/
137137
diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
138138
--- 05_drivers_gpio_uart/Makefile
139139
+++ 06_uart_chainloader/Makefile
140-
@@ -22,27 +22,29 @@
140+
@@ -23,27 +23,29 @@
141141

142142
# BSP-specific arguments.
143143
ifeq ($(BSP),rpi3)
@@ -187,7 +187,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
187187
endif
188188

189189
QEMU_MISSING_STRING = "This board is not yet supported for QEMU."
190-
@@ -74,8 +76,8 @@
190+
@@ -75,8 +77,8 @@
191191
-O binary
192192

193193
EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
@@ -198,7 +198,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
198198

199199
##------------------------------------------------------------------------------
200200
## Dockerization
201-
@@ -94,7 +96,7 @@
201+
@@ -95,7 +97,7 @@
202202
ifeq ($(shell uname -s),Linux)
203203
DOCKER_CMD_DEV = $(DOCKER_CMD_INTERACT) $(DOCKER_ARG_DEV)
204204

@@ -207,7 +207,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
207207
endif
208208

209209

210-
@@ -102,7 +104,7 @@
210+
@@ -103,7 +105,7 @@
211211
##--------------------------------------------------------------------------------------------------
212212
## Targets
213213
##--------------------------------------------------------------------------------------------------
@@ -216,7 +216,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
216216

217217
all: $(KERNEL_BIN)
218218

219-
@@ -131,7 +133,7 @@
219+
@@ -132,7 +134,7 @@
220220
##------------------------------------------------------------------------------
221221
ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board.
222222

@@ -225,7 +225,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
225225
$(call colorecho, "\n$(QEMU_MISSING_STRING)")
226226

227227
else # QEMU is supported.
228-
@@ -139,13 +141,18 @@
228+
@@ -140,13 +142,18 @@
229229
qemu: $(KERNEL_BIN)
230230
$(call colorecho, "\nLaunching QEMU")
231231
@$(DOCKER_QEMU) $(EXEC_QEMU) $(QEMU_RELEASE_ARGS) -kernel $(KERNEL_BIN)
@@ -247,7 +247,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
247247

248248
##------------------------------------------------------------------------------
249249
## Run clippy
250-
@@ -209,7 +216,8 @@
250+
@@ -210,7 +217,8 @@
251251
##------------------------------------------------------------------------------
252252
test_boot: $(KERNEL_BIN)
253253
$(call colorecho, "\nBoot test - $(BSP)")

‎07_timestamps/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
##
33
## Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
44

5-
include ../common/color.mk.in
5+
include ../common/color.mk
6+
include ../common/docker.mk
67

78
##--------------------------------------------------------------------------------------------------
89
## Optional, user-provided configuration values
@@ -80,12 +81,12 @@ EXEC_MINIPUSH = ruby ../common/serial/minipush.rb
8081
##------------------------------------------------------------------------------
8182
## Dockerization
8283
##------------------------------------------------------------------------------
83-
DOCKER_IMAGE = rustembedded/osdev-utils
8484
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8585
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
8686
DOCKER_ARG_DIR_COMMON = -v $(shell pwd)/../common:/work/common
8787
DOCKER_ARG_DEV = --privileged -v /dev:/dev
8888

89+
# DOCKER_IMAGE defined in include file (see top of this file).
8990
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
9091
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
9192
DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE)

‎07_timestamps/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Binary files 06_uart_chainloader/demo_payload_rpi4.img and 07_timestamps/demo_pa
6262
diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
6363
--- 06_uart_chainloader/Makefile
6464
+++ 07_timestamps/Makefile
65-
@@ -22,29 +22,27 @@
65+
@@ -23,29 +23,27 @@
6666

6767
# BSP-specific arguments.
6868
ifeq ($(BSP),rpi3)
@@ -112,7 +112,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
112112
endif
113113

114114
QEMU_MISSING_STRING = "This board is not yet supported for QEMU."
115-
@@ -76,7 +74,7 @@
115+
@@ -77,7 +75,7 @@
116116
-O binary
117117

118118
EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
@@ -121,7 +121,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
121121
EXEC_MINIPUSH = ruby ../common/serial/minipush.rb
122122

123123
##------------------------------------------------------------------------------
124-
@@ -133,7 +131,7 @@
124+
@@ -134,7 +132,7 @@
125125
##------------------------------------------------------------------------------
126126
ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board.
127127

@@ -130,7 +130,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
130130
$(call colorecho, "\n$(QEMU_MISSING_STRING)")
131131

132132
else # QEMU is supported.
133-
@@ -142,17 +140,13 @@
133+
@@ -143,17 +141,13 @@
134134
$(call colorecho, "\nLaunching QEMU")
135135
@$(DOCKER_QEMU) $(EXEC_QEMU) $(QEMU_RELEASE_ARGS) -kernel $(KERNEL_BIN)
136136

@@ -149,7 +149,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
149149

150150
##------------------------------------------------------------------------------
151151
## Run clippy
152-
@@ -216,8 +210,7 @@
152+
@@ -217,8 +211,7 @@
153153
##------------------------------------------------------------------------------
154154
test_boot: $(KERNEL_BIN)
155155
$(call colorecho, "\nBoot test - $(BSP)")

‎08_hw_debug_JTAG/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
##
33
## Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
44

5-
include ../common/color.mk.in
5+
include ../common/color.mk
6+
include ../common/docker.mk
67

78
##--------------------------------------------------------------------------------------------------
89
## Optional, user-provided configuration values
@@ -84,14 +85,14 @@ EXEC_MINIPUSH = ruby ../common/serial/minipush.rb
8485
##------------------------------------------------------------------------------
8586
## Dockerization
8687
##------------------------------------------------------------------------------
87-
DOCKER_IMAGE = rustembedded/osdev-utils
8888
DOCKER_CMD = docker run -t --rm -v $(shell pwd):/work/tutorial -w /work/tutorial
8989
DOCKER_CMD_INTERACT = $(DOCKER_CMD) -i
9090
DOCKER_ARG_DIR_COMMON = -v $(shell pwd)/../common:/work/common
9191
DOCKER_ARG_DIR_JTAG = -v $(shell pwd)/../X1_JTAG_boot:/work/X1_JTAG_boot
9292
DOCKER_ARG_DEV = --privileged -v /dev:/dev
9393
DOCKER_ARG_NET = --network host
9494

95+
# DOCKER_IMAGE defined in include file (see top of this file).
9596
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
9697
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
9798
DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE)

0 commit comments

Comments
 (0)