Skip to content

Commit d3e5834

Browse files
andre-richterandre-richter
committed
Linker: Use absolute library path
1 parent 7ca7f67 commit d3e5834

File tree

37 files changed

+135
-80
lines changed

37 files changed

+135
-80
lines changed

‎01_wait_forever/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ifeq ($(BSP),rpi3)
2828
OBJDUMP_BINARY = aarch64-none-elf-objdump
2929
NM_BINARY = aarch64-none-elf-nm
3030
READELF_BINARY = aarch64-none-elf-readelf
31-
LD_SCRIPT_PATH = src/bsp/raspberrypi
31+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3232
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3333
else ifeq ($(BSP),rpi4)
3434
TARGET = aarch64-unknown-none-softfloat
@@ -39,7 +39,7 @@ else ifeq ($(BSP),rpi4)
3939
OBJDUMP_BINARY = aarch64-none-elf-objdump
4040
NM_BINARY = aarch64-none-elf-nm
4141
READELF_BINARY = aarch64-none-elf-readelf
42-
LD_SCRIPT_PATH = src/bsp/raspberrypi
42+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
4343
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
4444
endif
4545

‎01_wait_forever/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎02_runtime_init/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ifeq ($(BSP),rpi3)
2828
OBJDUMP_BINARY = aarch64-none-elf-objdump
2929
NM_BINARY = aarch64-none-elf-nm
3030
READELF_BINARY = aarch64-none-elf-readelf
31-
LD_SCRIPT_PATH = src/bsp/raspberrypi
31+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3232
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3333
else ifeq ($(BSP),rpi4)
3434
TARGET = aarch64-unknown-none-softfloat
@@ -39,7 +39,7 @@ else ifeq ($(BSP),rpi4)
3939
OBJDUMP_BINARY = aarch64-none-elf-objdump
4040
NM_BINARY = aarch64-none-elf-nm
4141
READELF_BINARY = aarch64-none-elf-readelf
42-
LD_SCRIPT_PATH = src/bsp/raspberrypi
42+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
4343
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
4444
endif
4545

‎02_runtime_init/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎03_hacky_hello_world/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ifeq ($(BSP),rpi3)
2828
OBJDUMP_BINARY = aarch64-none-elf-objdump
2929
NM_BINARY = aarch64-none-elf-nm
3030
READELF_BINARY = aarch64-none-elf-readelf
31-
LD_SCRIPT_PATH = src/bsp/raspberrypi
31+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3232
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3333
else ifeq ($(BSP),rpi4)
3434
TARGET = aarch64-unknown-none-softfloat
@@ -39,7 +39,7 @@ else ifeq ($(BSP),rpi4)
3939
OBJDUMP_BINARY = aarch64-none-elf-objdump
4040
NM_BINARY = aarch64-none-elf-nm
4141
READELF_BINARY = aarch64-none-elf-readelf
42-
LD_SCRIPT_PATH = src/bsp/raspberrypi
42+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
4343
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
4444
endif
4545

‎03_hacky_hello_world/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎04_safe_globals/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ifeq ($(BSP),rpi3)
2828
OBJDUMP_BINARY = aarch64-none-elf-objdump
2929
NM_BINARY = aarch64-none-elf-nm
3030
READELF_BINARY = aarch64-none-elf-readelf
31-
LD_SCRIPT_PATH = src/bsp/raspberrypi
31+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3232
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3333
else ifeq ($(BSP),rpi4)
3434
TARGET = aarch64-unknown-none-softfloat
@@ -39,7 +39,7 @@ else ifeq ($(BSP),rpi4)
3939
OBJDUMP_BINARY = aarch64-none-elf-objdump
4040
NM_BINARY = aarch64-none-elf-nm
4141
READELF_BINARY = aarch64-none-elf-readelf
42-
LD_SCRIPT_PATH = src/bsp/raspberrypi
42+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
4343
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
4444
endif
4545

‎04_safe_globals/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎05_drivers_gpio_uart/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ifeq ($(BSP),rpi3)
3131
OBJDUMP_BINARY = aarch64-none-elf-objdump
3232
NM_BINARY = aarch64-none-elf-nm
3333
READELF_BINARY = aarch64-none-elf-readelf
34-
LD_SCRIPT_PATH = src/bsp/raspberrypi
34+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3535
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3636
else ifeq ($(BSP),rpi4)
3737
TARGET = aarch64-unknown-none-softfloat
@@ -42,7 +42,7 @@ else ifeq ($(BSP),rpi4)
4242
OBJDUMP_BINARY = aarch64-none-elf-objdump
4343
NM_BINARY = aarch64-none-elf-nm
4444
READELF_BINARY = aarch64-none-elf-readelf
45-
LD_SCRIPT_PATH = src/bsp/raspberrypi
45+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
4646
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
4747
endif
4848

‎05_drivers_gpio_uart/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎06_uart_chainloader/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ifeq ($(BSP),rpi3)
3131
OBJDUMP_BINARY = aarch64-none-elf-objdump
3232
NM_BINARY = aarch64-none-elf-nm
3333
READELF_BINARY = aarch64-none-elf-readelf
34-
LD_SCRIPT_PATH = src/bsp/raspberrypi
34+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3535
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3636
CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi3.img
3737
else ifeq ($(BSP),rpi4)
@@ -43,7 +43,7 @@ else ifeq ($(BSP),rpi4)
4343
OBJDUMP_BINARY = aarch64-none-elf-objdump
4444
NM_BINARY = aarch64-none-elf-nm
4545
READELF_BINARY = aarch64-none-elf-readelf
46-
LD_SCRIPT_PATH = src/bsp/raspberrypi
46+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
4747
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
4848
CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi4.img
4949
endif

‎06_uart_chainloader/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
150150
- OBJDUMP_BINARY = aarch64-none-elf-objdump
151151
- NM_BINARY = aarch64-none-elf-nm
152152
- READELF_BINARY = aarch64-none-elf-readelf
153+
- LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
154+
- RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
153155
+ TARGET = aarch64-unknown-none-softfloat
154156
+ KERNEL_BIN = kernel8.img
155157
+ QEMU_BINARY = qemu-system-aarch64
@@ -158,8 +160,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
158160
+ OBJDUMP_BINARY = aarch64-none-elf-objdump
159161
+ NM_BINARY = aarch64-none-elf-nm
160162
+ READELF_BINARY = aarch64-none-elf-readelf
161-
LD_SCRIPT_PATH = src/bsp/raspberrypi
162-
- RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
163+
+ LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
163164
+ RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
164165
+ CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi3.img
165166
else ifeq ($(BSP),rpi4)
@@ -171,6 +172,8 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
171172
- OBJDUMP_BINARY = aarch64-none-elf-objdump
172173
- NM_BINARY = aarch64-none-elf-nm
173174
- READELF_BINARY = aarch64-none-elf-readelf
175+
- LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
176+
- RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
174177
+ TARGET = aarch64-unknown-none-softfloat
175178
+ KERNEL_BIN = kernel8.img
176179
+ QEMU_BINARY = qemu-system-aarch64
@@ -179,8 +182,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
179182
+ OBJDUMP_BINARY = aarch64-none-elf-objdump
180183
+ NM_BINARY = aarch64-none-elf-nm
181184
+ READELF_BINARY = aarch64-none-elf-readelf
182-
LD_SCRIPT_PATH = src/bsp/raspberrypi
183-
- RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
185+
+ LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
184186
+ RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
185187
+ CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi4.img
186188
endif

‎06_uart_chainloader/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎07_timestamps/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ifeq ($(BSP),rpi3)
3131
OBJDUMP_BINARY = aarch64-none-elf-objdump
3232
NM_BINARY = aarch64-none-elf-nm
3333
READELF_BINARY = aarch64-none-elf-readelf
34-
LD_SCRIPT_PATH = src/bsp/raspberrypi
34+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3535
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3636
else ifeq ($(BSP),rpi4)
3737
TARGET = aarch64-unknown-none-softfloat
@@ -42,7 +42,7 @@ else ifeq ($(BSP),rpi4)
4242
OBJDUMP_BINARY = aarch64-none-elf-objdump
4343
NM_BINARY = aarch64-none-elf-nm
4444
READELF_BINARY = aarch64-none-elf-readelf
45-
LD_SCRIPT_PATH = src/bsp/raspberrypi
45+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
4646
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
4747
endif
4848

‎07_timestamps/README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
7474
- OBJDUMP_BINARY = aarch64-none-elf-objdump
7575
- NM_BINARY = aarch64-none-elf-nm
7676
- READELF_BINARY = aarch64-none-elf-readelf
77+
- LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
78+
- RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
79+
- CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi3.img
7780
+ TARGET = aarch64-unknown-none-softfloat
7881
+ KERNEL_BIN = kernel8.img
7982
+ QEMU_BINARY = qemu-system-aarch64
@@ -82,9 +85,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
8285
+ OBJDUMP_BINARY = aarch64-none-elf-objdump
8386
+ NM_BINARY = aarch64-none-elf-nm
8487
+ READELF_BINARY = aarch64-none-elf-readelf
85-
LD_SCRIPT_PATH = src/bsp/raspberrypi
86-
- RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
87-
- CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi3.img
88+
+ LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
8889
+ RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
8990
else ifeq ($(BSP),rpi4)
9091
- TARGET = aarch64-unknown-none-softfloat
@@ -95,6 +96,9 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
9596
- OBJDUMP_BINARY = aarch64-none-elf-objdump
9697
- NM_BINARY = aarch64-none-elf-nm
9798
- READELF_BINARY = aarch64-none-elf-readelf
99+
- LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
100+
- RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
101+
- CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi4.img
98102
+ TARGET = aarch64-unknown-none-softfloat
99103
+ KERNEL_BIN = kernel8.img
100104
+ QEMU_BINARY = qemu-system-aarch64
@@ -103,9 +107,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
103107
+ OBJDUMP_BINARY = aarch64-none-elf-objdump
104108
+ NM_BINARY = aarch64-none-elf-nm
105109
+ READELF_BINARY = aarch64-none-elf-readelf
106-
LD_SCRIPT_PATH = src/bsp/raspberrypi
107-
- RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
108-
- CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi4.img
110+
+ LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
109111
+ RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
110112
endif
111113

‎07_timestamps/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎08_hw_debug_JTAG/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ifeq ($(BSP),rpi3)
3333
READELF_BINARY = aarch64-none-elf-readelf
3434
OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
3535
JTAG_BOOT_IMAGE = ../X1_JTAG_boot/jtag_boot_rpi3.img
36-
LD_SCRIPT_PATH = src/bsp/raspberrypi
36+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3737
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3838
else ifeq ($(BSP),rpi4)
3939
TARGET = aarch64-unknown-none-softfloat
@@ -46,7 +46,7 @@ else ifeq ($(BSP),rpi4)
4646
READELF_BINARY = aarch64-none-elf-readelf
4747
OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
4848
JTAG_BOOT_IMAGE = ../X1_JTAG_boot/jtag_boot_rpi4.img
49-
LD_SCRIPT_PATH = src/bsp/raspberrypi
49+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
5050
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
5151
endif
5252

‎08_hw_debug_JTAG/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ diff -uNr 07_timestamps/Makefile 08_hw_debug_JTAG/Makefile
326326
READELF_BINARY = aarch64-none-elf-readelf
327327
+ OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
328328
+ JTAG_BOOT_IMAGE = ../X1_JTAG_boot/jtag_boot_rpi3.img
329-
LD_SCRIPT_PATH = src/bsp/raspberrypi
329+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
330330
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
331331
else ifeq ($(BSP),rpi4)
332332
@@ -42,6 +44,8 @@
@@ -335,7 +335,7 @@ diff -uNr 07_timestamps/Makefile 08_hw_debug_JTAG/Makefile
335335
READELF_BINARY = aarch64-none-elf-readelf
336336
+ OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
337337
+ JTAG_BOOT_IMAGE = ../X1_JTAG_boot/jtag_boot_rpi4.img
338-
LD_SCRIPT_PATH = src/bsp/raspberrypi
338+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
339339
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
340340
endif
341341
@@ -99,18 +103,25 @@

‎08_hw_debug_JTAG/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎09_privilege_level/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ifeq ($(BSP),rpi3)
3333
READELF_BINARY = aarch64-none-elf-readelf
3434
OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
3535
JTAG_BOOT_IMAGE = ../X1_JTAG_boot/jtag_boot_rpi3.img
36-
LD_SCRIPT_PATH = src/bsp/raspberrypi
36+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3737
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3838
else ifeq ($(BSP),rpi4)
3939
TARGET = aarch64-unknown-none-softfloat
@@ -46,7 +46,7 @@ else ifeq ($(BSP),rpi4)
4646
READELF_BINARY = aarch64-none-elf-readelf
4747
OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
4848
JTAG_BOOT_IMAGE = ../X1_JTAG_boot/jtag_boot_rpi4.img
49-
LD_SCRIPT_PATH = src/bsp/raspberrypi
49+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
5050
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
5151
endif
5252

‎09_privilege_level/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use std::{env, fs};
1+
use std::{env, fs, process};
22

33
fn main() {
4-
let ld_script_path = env::var("LD_SCRIPT_PATH").unwrap_or_default();
4+
let ld_script_path = match env::var("LD_SCRIPT_PATH") {
5+
Ok(var) => var,
6+
_ => process::exit(0),
7+
};
58

69
let files = fs::read_dir(ld_script_path).unwrap();
710
files

‎10_virtual_mem_part1_identity_mapping/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ifeq ($(BSP),rpi3)
3333
READELF_BINARY = aarch64-none-elf-readelf
3434
OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
3535
JTAG_BOOT_IMAGE = ../X1_JTAG_boot/jtag_boot_rpi3.img
36-
LD_SCRIPT_PATH = src/bsp/raspberrypi
36+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
3737
RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
3838
else ifeq ($(BSP),rpi4)
3939
TARGET = aarch64-unknown-none-softfloat
@@ -46,7 +46,7 @@ else ifeq ($(BSP),rpi4)
4646
READELF_BINARY = aarch64-none-elf-readelf
4747
OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
4848
JTAG_BOOT_IMAGE = ../X1_JTAG_boot/jtag_boot_rpi4.img
49-
LD_SCRIPT_PATH = src/bsp/raspberrypi
49+
LD_SCRIPT_PATH = $(shell pwd)/src/bsp/raspberrypi
5050
RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
5151
endif
5252

0 commit comments

Comments
 (0)