Skip to content

build: make cross-compiler toolchain prefix configurable via CROSS_CO… #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
James7zy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: make cross-compiler toolchain prefix configurable via CROSS_CO… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 25 additions & 21 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ SHELL := /bin/bash
CARGO_HOME ?= $(HOME)/.cargo
export PATH := $(CARGO_HOME)/bin:$(PATH)

# Cross-compiler toolchain prefix (override with: make CROSS_COMPILE=aarch64-none-elf-)
CROSS_COMPILE ?= aarch64-none-linux-gnu-
export CROSS_COMPILE

# Target binary name
TARGET := hypervisor
# RELEASE=1 enables release mode (smaller binary, faster execution)
Expand Down Expand Up @@ -37,7 +41,7 @@ build:
@echo "Building hypervisor..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE)
@echo "Creating raw binary..."
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(BINARY_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(BINARY_BIN)

# Run in QEMU
run: build
Expand All @@ -56,7 +60,7 @@ endif
@echo "Building hypervisor with guest support..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE) --features guest
@echo "Creating raw binary..."
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(BINARY_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(BINARY_BIN)
@echo "Starting QEMU with guest: $(GUEST_ELF)"
@echo "Press Ctrl+A then X to exit QEMU"
$(QEMU) $(QEMU_FLAGS) \
Expand All @@ -73,7 +77,7 @@ run-linux:
@echo "Building hypervisor with Linux guest support..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE) --features linux_guest
@echo "Creating raw binary..."
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(BINARY_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(BINARY_BIN)
@echo "Starting QEMU with Linux kernel..."
@echo "Press Ctrl+A then X to exit QEMU"
$(QEMU) $(QEMU_FLAGS) \
Expand All @@ -87,7 +91,7 @@ run-linux-smp:
@echo "Building hypervisor with multi-pCPU support..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE) --features multi_pcpu
@echo "Creating raw binary..."
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(BINARY_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(BINARY_BIN)
@echo "Starting QEMU with Linux kernel (multi-pCPU)..."
@echo "Press Ctrl+A then X to exit QEMU"
$(QEMU) $(QEMU_FLAGS) \
Expand All @@ -113,7 +117,7 @@ run-multi-vm:
@echo "Building hypervisor with multi-VM support..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE) --features multi_vm
@echo "Creating raw binary..."
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(BINARY_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(BINARY_BIN)
@echo "Starting QEMU with 2 Linux VMs..."
@echo "Press Ctrl+A then X to exit QEMU"
$(QEMU) $(QEMU_FLAGS_MULTI_VM) \
Expand Down Expand Up @@ -145,7 +149,7 @@ run-android:
@echo "Building hypervisor with Linux guest support..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE) --features linux_guest
@echo "Creating raw binary..."
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(BINARY_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(BINARY_BIN)
@echo "Starting QEMU with Android-configured kernel..."
@echo "Press Ctrl+A then X to exit QEMU"
$(QEMU) $(QEMU_FLAGS_ANDROID) \
Expand Down Expand Up @@ -246,7 +250,7 @@ run-tfa-linux:
@echo "Building hypervisor with TF-A boot support..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE) --features tfa_boot
@echo "Creating raw binary..."
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(BINARY_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(BINARY_BIN)
@echo "Starting TF-A → hypervisor → Linux boot chain..."
@echo "Press Ctrl+A then X to exit QEMU"
$(QEMU_SEL2) -machine virt,secure=on,virtualization=on,gic-version=3 \
Expand All @@ -268,45 +272,45 @@ SPMC_BIN := $(BUILD_DIR)/$(TARGET)_spmc.bin
build-spmc:
@echo "Building SPMC (sel2 feature)..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE) --features sel2
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(SPMC_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(SPMC_BIN)
@echo "SPMC binary: $(SPMC_BIN)"

# SP Hello binary (S-EL1 Secure Partition)
SP_HELLO_BIN := tfa/sp_hello/sp_hello.bin

build-sp-hello:
@echo "Building SP Hello (S-EL1)..."
aarch64-linux-gnu-as -o tfa/sp_hello/sp_hello.o tfa/sp_hello/start.S
aarch64-linux-gnu-ld -T tfa/sp_hello/linker.ld -o tfa/sp_hello/sp_hello.elf tfa/sp_hello/sp_hello.o
aarch64-linux-gnu-objcopy -O binary tfa/sp_hello/sp_hello.elf $(SP_HELLO_BIN)
$(CROSS_COMPILE)as -o tfa/sp_hello/sp_hello.o tfa/sp_hello/start.S
$(CROSS_COMPILE)ld -T tfa/sp_hello/linker.ld -o tfa/sp_hello/sp_hello.elf tfa/sp_hello/sp_hello.o
$(CROSS_COMPILE)objcopy -O binary tfa/sp_hello/sp_hello.elf $(SP_HELLO_BIN)
@echo "SP Hello binary: $(SP_HELLO_BIN)"

# SP IRQ binary (S-EL1 Secure Partition with interrupt handling)
SP_IRQ_BIN := tfa/sp_irq/sp_irq.bin

build-sp-irq:
@echo "Building SP IRQ (S-EL1)..."
aarch64-linux-gnu-as -o tfa/sp_irq/sp_irq.o tfa/sp_irq/start.S
aarch64-linux-gnu-ld -T tfa/sp_irq/linker.ld -o tfa/sp_irq/sp_irq.elf tfa/sp_irq/sp_irq.o
aarch64-linux-gnu-objcopy -O binary tfa/sp_irq/sp_irq.elf $(SP_IRQ_BIN)
$(CROSS_COMPILE)as -o tfa/sp_irq/sp_irq.o tfa/sp_irq/start.S
$(CROSS_COMPILE)ld -T tfa/sp_irq/linker.ld -o tfa/sp_irq/sp_irq.elf tfa/sp_irq/sp_irq.o
$(CROSS_COMPILE)objcopy -O binary tfa/sp_irq/sp_irq.elf $(SP_IRQ_BIN)
@echo "SP IRQ binary: $(SP_IRQ_BIN)"

# SP Relay binary (S-EL1, SP-to-SP testing)
SP_RELAY_BIN := tfa/sp_relay/sp_relay.bin

build-sp-relay:
@echo "Building SP Relay (S-EL1)..."
aarch64-linux-gnu-as -o tfa/sp_relay/sp_relay.o tfa/sp_relay/start.S
aarch64-linux-gnu-ld -T tfa/sp_relay/linker.ld -o tfa/sp_relay/sp_relay.elf tfa/sp_relay/sp_relay.o
aarch64-linux-gnu-objcopy -O binary tfa/sp_relay/sp_relay.elf $(SP_RELAY_BIN)
$(CROSS_COMPILE)as -o tfa/sp_relay/sp_relay.o tfa/sp_relay/start.S
$(CROSS_COMPILE)ld -T tfa/sp_relay/linker.ld -o tfa/sp_relay/sp_relay.elf tfa/sp_relay/sp_relay.o
$(CROSS_COMPILE)objcopy -O binary tfa/sp_relay/sp_relay.elf $(SP_RELAY_BIN)
@echo "SP Relay binary: $(SP_RELAY_BIN)"

# Build BL33 FF-A test client (sends FF-A SMCs to SPMC, prints PASS/FAIL)
build-bl33-ffa-test:
@echo "Building BL33 FF-A test client..."
aarch64-linux-gnu-as -o $(BUILD_DIR)/bl33_ffa_test.o tfa/bl33_ffa_test/start.S
aarch64-linux-gnu-ld -T tfa/bl33_ffa_test/linker.ld -o $(BUILD_DIR)/bl33_ffa_test.elf $(BUILD_DIR)/bl33_ffa_test.o
aarch64-linux-gnu-objcopy -O binary $(BUILD_DIR)/bl33_ffa_test.elf tfa/bl33_ffa_test.bin
$(CROSS_COMPILE)as -o $(BUILD_DIR)/bl33_ffa_test.o tfa/bl33_ffa_test/start.S
$(CROSS_COMPILE)ld -T tfa/bl33_ffa_test/linker.ld -o $(BUILD_DIR)/bl33_ffa_test.elf $(BUILD_DIR)/bl33_ffa_test.o
$(CROSS_COMPILE)objcopy -O binary $(BUILD_DIR)/bl33_ffa_test.elf tfa/bl33_ffa_test.bin
@echo "BL33 test client: tfa/bl33_ffa_test.bin"

# Build TF-A with real SPMC (BL32) + FF-A test client (BL33)
Expand Down Expand Up @@ -361,7 +365,7 @@ run-tfa-linux-ffa:
@echo "Building hypervisor with TF-A boot support..."
cargo build --target aarch64-unknown-none $(CARGO_RELEASE) --features tfa_boot
@echo "Creating raw binary..."
aarch64-linux-gnu-objcopy -O binary $(BINARY) $(BINARY_BIN)
$(CROSS_COMPILE)objcopy -O binary $(BINARY) $(BINARY_BIN)
@echo "Starting TF-A → SPMC → hypervisor → Linux boot chain..."
@echo "Press Ctrl+A then X to exit QEMU"
$(QEMU_SEL2) -machine virt,secure=on,virtualization=on,gic-version=3 \
Expand Down
10 changes: 7 additions & 3 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ fn main() {
let arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();

if arch == "aarch64" {
let cross_compile =
env::var("CROSS_COMPILE").unwrap_or_else(|_| format!("{}-none-linux-gnu-", arch));
println!("cargo:rerun-if-env-changed=CROSS_COMPILE");

// Determine which boot file and linker script to use based on features
let sel2 = env::var("CARGO_FEATURE_SEL2").is_ok();

Expand Down Expand Up @@ -37,7 +41,7 @@ fn main() {
println!("cargo:rerun-if-changed={}", asm_src);

// Try gcc first, fall back to as
let status = Command::new("aarch64-linux-gnu-gcc")
let status = Command::new(format!("{}gcc", cross_compile))
.args([
"-c",
asm_src,
Expand All @@ -49,7 +53,7 @@ fn main() {
.status()
.or_else(|_| {
// Fallback to using assembler directly
Command::new("aarch64-linux-gnu-as")
Command::new(format!("{}as", cross_compile))
.args([asm_src, "-o", obj_path.to_str().unwrap()])
.status()
})
Expand All @@ -62,7 +66,7 @@ fn main() {

// Create archive with all object files
let boot_a = out_dir.join("libboot.a");
let mut ar_cmd = Command::new("aarch64-linux-gnu-ar");
let mut ar_cmd = Command::new(format!("{}ar", cross_compile));
ar_cmd.arg("crs").arg(boot_a.to_str().unwrap());

for obj in &object_files {
Expand Down