Skip to content

Commit cdfce0d

Browse files
rahealyandre-richter
rahealy
authored and
andre-richter
committed
add openocd argument and raspboot device vars
1 parent 345ea5c commit cdfce0d

File tree

11 files changed

+105
-57
lines changed

11 files changed

+105
-57
lines changed

Diff for: ‎07_abstraction/Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ DOCKER_CMD = docker run -it --rm
3939
DOCKER_ARG_CURDIR = -v $(shell pwd):/work -w /work
4040
DOCKER_ARG_TTY = --privileged -v /dev:/dev
4141

42-
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
43-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
42+
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
43+
DOCKER_EXEC_RASPBOOT = raspbootcom
44+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
45+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
4446

4547
.PHONY: all qemu raspboot clippy clean objdump nm
4648

@@ -59,7 +61,8 @@ qemu: all
5961

6062
raspboot: all
6163
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
62-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
64+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) \
65+
kernel8.img
6366

6467
clippy:
6568
cargo xclippy --target=$(TARGET)

Diff for: ‎08_random/Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ DOCKER_ARG_CURDIR = -v $(shell pwd):/work -w /work
4040
DOCKER_ARG_TTY = --privileged -v /dev:/dev
4141

4242
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
43-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
43+
DOCKER_EXEC_RASPBOOT = raspbootcom
44+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
45+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
4446

4547
.PHONY: all qemu raspboot clippy clean objdump nm
4648

@@ -59,7 +61,8 @@ qemu: all
5961

6062
raspboot: all
6163
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
62-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
64+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) \
65+
kernel8.img
6366

6467
clippy:
6568
cargo xclippy --target=$(TARGET)

Diff for: ‎09_delays/Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ DOCKER_CMD = docker run -it --rm
3939
DOCKER_ARG_CURDIR = -v $(shell pwd):/work -w /work
4040
DOCKER_ARG_TTY = --privileged -v /dev:/dev
4141

42-
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
43-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
42+
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
43+
DOCKER_EXEC_RASPBOOT = raspbootcom
44+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
45+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
4446

4547
.PHONY: all qemu raspboot clippy clean objdump nm
4648

@@ -59,7 +61,8 @@ qemu: all
5961

6062
raspboot: all
6163
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
62-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
64+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) \
65+
kernel8.img
6366

6467
clippy:
6568
cargo xclippy --target=$(TARGET)

Diff for: ‎0A_power/Makefile

+5-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ DOCKER_CMD = docker run -it --rm
3939
DOCKER_ARG_CURDIR = -v $(shell pwd):/work -w /work
4040
DOCKER_ARG_TTY = --privileged -v /dev:/dev
4141

42-
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
43-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
42+
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
43+
DOCKER_EXEC_RASPBOOT = raspbootcom
44+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
45+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
4446

4547
.PHONY: all qemu raspboot clippy clean objdump nm
4648

@@ -59,7 +61,7 @@ qemu: all
5961

6062
raspboot: all
6163
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
62-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
64+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) kernel8.img
6365

6466
clippy:
6567
cargo xclippy --target=$(TARGET)

Diff for: ‎0C_exception_levels/Makefile

+12-5
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ OBJCOPY_PARAMS = --strip-all -O binary
3535

3636
CONTAINER_UTILS = andrerichter/raspi3-utils
3737
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38+
# CONTAINER_OPENOCD_ARG = -f openocd/tcl/interface/ftdi/olimex-jtag-tiny.cfg -f /openocd/rpi3.cfg
39+
3840
CONTAINER_GDB = andrerichter/raspi3-gdb
3941

4042
DOCKER_CMD = docker run -it --rm
@@ -43,8 +45,11 @@ DOCKER_ARG_TTY = --privileged -v /dev:/dev
4345
DOCKER_ARG_JTAG = -v $(shell pwd)/../X1_JTAG_boot:/jtag
4446
DOCKER_ARG_NET = --network host
4547

46-
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
47-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
48+
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
49+
DOCKER_EXEC_RASPBOOT = raspbootcom
50+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
51+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
52+
4853

4954
.PHONY: all qemu raspboot clippy clean objdump nm jtagboot openocd gdb gdb-opt0
5055

@@ -63,7 +68,8 @@ qemu: all
6368

6469
raspboot: all
6570
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
66-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
71+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) \
72+
kernel8.img
6773

6874
clippy:
6975
cargo xclippy --target=$(TARGET)
@@ -79,10 +85,11 @@ nm:
7985

8086
jtagboot:
8187
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_JTAG) $(CONTAINER_UTILS) \
82-
$(DOCKER_EXEC_RASPBOOT) /jtag/jtag_boot.img
88+
$(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) /jtag/jtag_boot.img
8389

8490
openocd:
85-
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD)
91+
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD) \
92+
$(CONTAINER_OPENOCD_ARG)
8693

8794
define gen_gdb
8895
$(XRUSTC_CMD) -- $1

Diff for: ‎0D_virtual_memory/Makefile

+14-8
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,22 @@ CARGO_OUTPUT = target/$(TARGET)/release/kernel8
3333
OBJCOPY = cargo objcopy --
3434
OBJCOPY_PARAMS = --strip-all -O binary
3535

36-
CONTAINER_UTILS = andrerichter/raspi3-utils
37-
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38-
CONTAINER_GDB = andrerichter/raspi3-gdb
36+
CONTAINER_UTILS = andrerichter/raspi3-utils
37+
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38+
# CONTAINER_OPENOCD_ARG = -f openocd/tcl/interface/ftdi/olimex-jtag-tiny.cfg -f /openocd/rpi3.cfg
39+
CONTAINER_GDB = andrerichter/raspi3-gdb
3940

4041
DOCKER_CMD = docker run -it --rm
4142
DOCKER_ARG_CURDIR = -v $(shell pwd):/work -w /work
4243
DOCKER_ARG_TTY = --privileged -v /dev:/dev
4344
DOCKER_ARG_JTAG = -v $(shell pwd)/../X1_JTAG_boot:/jtag
4445
DOCKER_ARG_NET = --network host
4546

46-
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
47-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
47+
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
48+
DOCKER_EXEC_RASPBOOT = raspbootcom
49+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
50+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
51+
4852

4953
.PHONY: all qemu raspboot clippy clean objdump nm jtagboot openocd gdb gdb-opt0
5054

@@ -63,7 +67,8 @@ qemu: all
6367

6468
raspboot: all
6569
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
66-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
70+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) \
71+
$(DOCKER_EXEC_RASPBOOT_DEV) kernel8.img
6772

6873
clippy:
6974
cargo xclippy --target=$(TARGET)
@@ -79,10 +84,11 @@ nm:
7984

8085
jtagboot:
8186
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_JTAG) $(CONTAINER_UTILS) \
82-
$(DOCKER_EXEC_RASPBOOT) /jtag/jtag_boot.img
87+
$(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) /jtag/jtag_boot.img
8388

8489
openocd:
85-
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD)
90+
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD) \
91+
$(CONTAINER_OPENOCD_ARG)
8692

8793
define gen_gdb
8894
$(XRUSTC_CMD) -- $1

Diff for: ‎0E_cache_performance/Makefile

+13-8
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,21 @@ CARGO_OUTPUT = target/$(TARGET)/release/kernel8
3333
OBJCOPY = cargo objcopy --
3434
OBJCOPY_PARAMS = --strip-all -O binary
3535

36-
CONTAINER_UTILS = andrerichter/raspi3-utils
37-
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38-
CONTAINER_GDB = andrerichter/raspi3-gdb
36+
CONTAINER_UTILS = andrerichter/raspi3-utils
37+
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38+
# CONTAINER_OPENOCD_ARG = -f openocd/tcl/interface/ftdi/olimex-jtag-tiny.cfg -f /openocd/rpi3.cfg
39+
CONTAINER_GDB = andrerichter/raspi3-gdb
3940

4041
DOCKER_CMD = docker run -it --rm
4142
DOCKER_ARG_CURDIR = -v $(shell pwd):/work -w /work
4243
DOCKER_ARG_TTY = --privileged -v /dev:/dev
4344
DOCKER_ARG_JTAG = -v $(shell pwd)/../X1_JTAG_boot:/jtag
4445
DOCKER_ARG_NET = --network host
4546

46-
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
47-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
47+
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
48+
DOCKER_EXEC_RASPBOOT = raspbootcom
49+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
50+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
4851

4952
.PHONY: all qemu raspboot clippy clean objdump nm jtagboot openocd gdb gdb-opt0
5053

@@ -63,7 +66,8 @@ qemu: all
6366

6467
raspboot: all
6568
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
66-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
69+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) \
70+
$(DOCKER_EXEC_RASPBOOT_DEV) kernel8.img
6771

6872
clippy:
6973
cargo xclippy --target=$(TARGET)
@@ -79,10 +83,11 @@ nm:
7983

8084
jtagboot:
8185
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_JTAG) $(CONTAINER_UTILS) \
82-
$(DOCKER_EXEC_RASPBOOT) /jtag/jtag_boot.img
86+
$(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) /jtag/jtag_boot.img
8387

8488
openocd:
85-
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD)
89+
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD) \
90+
$(CONTAINER_OPENOCD_ARG)
8691

8792
define gen_gdb
8893
$(XRUSTC_CMD) -- $1

Diff for: ‎0F_globals_synchronization_println/Makefile

+13-8
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,21 @@ CARGO_OUTPUT = target/$(TARGET)/release/kernel8
3333
OBJCOPY = cargo objcopy --
3434
OBJCOPY_PARAMS = --strip-all -O binary
3535

36-
CONTAINER_UTILS = andrerichter/raspi3-utils
37-
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38-
CONTAINER_GDB = andrerichter/raspi3-gdb
36+
CONTAINER_UTILS = andrerichter/raspi3-utils
37+
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38+
# CONTAINER_OPENOCD_ARG = -f openocd/tcl/interface/ftdi/olimex-jtag-tiny.cfg -f /openocd/rpi3.cfg
39+
CONTAINER_GDB = andrerichter/raspi3-gdb
3940

4041
DOCKER_CMD = docker run -it --rm
4142
DOCKER_ARG_CURDIR = -v $(shell pwd):/work -w /work
4243
DOCKER_ARG_TTY = --privileged -v /dev:/dev
4344
DOCKER_ARG_JTAG = -v $(shell pwd)/../X1_JTAG_boot:/jtag
4445
DOCKER_ARG_NET = --network host
4546

46-
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
47-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
47+
DOCKER_EXEC_QEMU = qemu-system-aarch64 -M raspi3 -kernel kernel8.img
48+
DOCKER_EXEC_RASPBOOT = raspbootcom
49+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
50+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
4851

4952
.PHONY: all qemu raspboot clippy clean objdump nm jtagboot openocd gdb gdb-opt0
5053

@@ -63,7 +66,8 @@ qemu: all
6366

6467
raspboot: all
6568
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
66-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
69+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) \
70+
kernel8.img
6771

6872
clippy:
6973
cargo xclippy --target=$(TARGET)
@@ -79,10 +83,11 @@ nm:
7983

8084
jtagboot:
8185
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_JTAG) $(CONTAINER_UTILS) \
82-
$(DOCKER_EXEC_RASPBOOT) /jtag/jtag_boot.img
86+
$(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) /jtag/jtag_boot.img
8387

8488
openocd:
85-
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD)
89+
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD) \
90+
$(CONTAINER_OPENOCD_ARG)
8691

8792
define gen_gdb
8893
$(XRUSTC_CMD) -- $1

Diff for: ‎10_DMA_memory/Makefile

+14-9
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ CARGO_OUTPUT = target/$(TARGET)/release/kernel8
3333
OBJCOPY = cargo objcopy --
3434
OBJCOPY_PARAMS = --strip-all -O binary
3535

36-
CONTAINER_UTILS = andrerichter/raspi3-utils
37-
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38-
CONTAINER_GDB = andrerichter/raspi3-gdb
36+
CONTAINER_UTILS = andrerichter/raspi3-utils
37+
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38+
# CONTAINER_OPENOCD_ARG = -f openocd/tcl/interface/ftdi/olimex-jtag-tiny.cfg -f /openocd/rpi3.cfg
39+
CONTAINER_GDB = andrerichter/raspi3-gdb
3940

4041
DOCKER_CMD = docker run -it --rm
4142
DOCKER_ARG_CURDIR = -v $(shell pwd):/work -w /work
@@ -44,8 +45,10 @@ DOCKER_ARG_JTAG = -v $(shell pwd)/../X1_JTAG_boot:/jtag
4445
DOCKER_ARG_NET = --network host
4546
DOCKER_ARG_EMU = -v $(shell pwd)/../emulation:/emulation
4647

47-
DOCKER_EXEC_QEMU = bash /emulation/qemu_multi_uart.sh
48-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
48+
DOCKER_EXEC_QEMU = bash /emulation/qemu_multi_uart.sh
49+
DOCKER_EXEC_RASPBOOT = raspbootcom
50+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
51+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
4952

5053
.PHONY: all qemu raspboot clippy clean objdump nm jtagboot openocd gdb gdb-opt0
5154

@@ -60,11 +63,12 @@ kernel8.img: $(CARGO_OUTPUT)
6063

6164
qemu: all
6265
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_EMU) \
63-
$(CONTAINER_UTILS) $(DOCKER_EXEC_QEMU)
66+
$(CONTAINER_UTILS) $(DOCKER_EXEC_QEMU)
6467

6568
raspboot: all
6669
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
67-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
70+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) \
71+
kernel8.img
6872

6973
clippy:
7074
cargo xclippy --target=$(TARGET)
@@ -80,10 +84,11 @@ nm:
8084

8185
jtagboot:
8286
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_JTAG) $(CONTAINER_UTILS) \
83-
$(DOCKER_EXEC_RASPBOOT) /jtag/jtag_boot.img
87+
$(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) /jtag/jtag_boot.img
8488

8589
openocd:
86-
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD)
90+
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD) \
91+
$(CONTAINER_OPENOCD_ARG)
8792

8893
define gen_gdb
8994
$(XRUSTC_CMD) -- $1

Diff for: ‎11_exceptions_groundwork/Makefile

+11-6
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ OBJCOPY_PARAMS = --strip-all -O binary
3535

3636
CONTAINER_UTILS = andrerichter/raspi3-utils
3737
CONTAINER_OPENOCD = andrerichter/raspi3-openocd
38+
# CONTAINER_OPENOCD_ARG = -f openocd/tcl/interface/ftdi/olimex-jtag-tiny.cfg -f /openocd/rpi3.cfg
3839
CONTAINER_GDB = andrerichter/raspi3-gdb
3940

4041
DOCKER_CMD = docker run -it --rm
@@ -44,8 +45,10 @@ DOCKER_ARG_JTAG = -v $(shell pwd)/../X1_JTAG_boot:/jtag
4445
DOCKER_ARG_NET = --network host
4546
DOCKER_ARG_EMU = -v $(shell pwd)/../emulation:/emulation
4647

47-
DOCKER_EXEC_QEMU = bash /emulation/qemu_multi_uart.sh
48-
DOCKER_EXEC_RASPBOOT = raspbootcom /dev/ttyUSB0
48+
DOCKER_EXEC_QEMU = bash /emulation/qemu_multi_uart.sh
49+
DOCKER_EXEC_RASPBOOT = raspbootcom
50+
DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyUSB0
51+
# DOCKER_EXEC_RASPBOOT_DEV = /dev/ttyACM0
4952

5053
.PHONY: all qemu raspboot clippy clean objdump nm jtagboot openocd gdb gdb-opt0
5154

@@ -60,11 +63,12 @@ kernel8.img: $(CARGO_OUTPUT)
6063

6164
qemu: all
6265
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_EMU) \
63-
$(CONTAINER_UTILS) $(DOCKER_EXEC_QEMU)
66+
$(CONTAINER_UTILS) $(DOCKER_EXEC_QEMU)
6467

6568
raspboot: all
6669
$(DOCKER_CMD) $(DOCKER_ARG_CURDIR) $(DOCKER_ARG_TTY) \
67-
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) kernel8.img
70+
$(CONTAINER_UTILS) $(DOCKER_EXEC_RASPBOOT) \
71+
$(DOCKER_EXEC_RASPBOOT_DEV) kernel8.img
6872

6973
clippy:
7074
cargo xclippy --target=$(TARGET)
@@ -80,10 +84,11 @@ nm:
8084

8185
jtagboot:
8286
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_JTAG) $(CONTAINER_UTILS) \
83-
$(DOCKER_EXEC_RASPBOOT) /jtag/jtag_boot.img
87+
$(DOCKER_EXEC_RASPBOOT) $(DOCKER_EXEC_RASPBOOT_DEV) /jtag/jtag_boot.img
8488

8589
openocd:
86-
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD)
90+
$(DOCKER_CMD) $(DOCKER_ARG_TTY) $(DOCKER_ARG_NET) $(CONTAINER_OPENOCD) \
91+
$(CONTAINER_OPENOCD_ARG)
8792

8893
define gen_gdb
8994
$(XRUSTC_CMD) -- $1

0 commit comments

Comments
 (0)