From 1f4d149ef705668bac60a83f2d6d917aada0956e Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Thu, 15 Jan 2026 03:00:16 +0100 Subject: [PATCH] config: riscv64: move ATF_COMPILER to arch code - no need to keep repeating this across families --- config/sources/families/d1.conf | 1 - config/sources/families/spacemit.conf | 1 - config/sources/riscv64.conf | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config/sources/families/d1.conf b/config/sources/families/d1.conf index 4c25f3117d..dfdc6fa484 100644 --- a/config/sources/families/d1.conf +++ b/config/sources/families/d1.conf @@ -14,7 +14,6 @@ BOOTPATCHDIR="u-boot-nezha" UBOOT_TARGET_MAP=";;u-boot.img" # Arm Trusted Firmware -declare -g ATF_COMPILER="riscv64-linux-gnu-" declare -g ATFSOURCE="https://github.com/riscv-software-src/opensbi.git" declare -g ATFDIR="opensbi" declare -g ATFBRANCH="tag:v1.5.1" diff --git a/config/sources/families/spacemit.conf b/config/sources/families/spacemit.conf index 5a8e06ba12..1284b418ec 100644 --- a/config/sources/families/spacemit.conf +++ b/config/sources/families/spacemit.conf @@ -12,7 +12,6 @@ declare -g LINUXFAMILY="spacemit" declare -g GOVERNOR="performance" # OpenSBI -declare -g ATF_COMPILER="riscv64-linux-gnu-" declare -g ATFSOURCE="https://gitee.com/bianbu-linux/opensbi.git" declare -g ATFDIR="opensbi" declare -g ATFBRANCH="tag:k1-bl-v2.2.7-release" diff --git a/config/sources/riscv64.conf b/config/sources/riscv64.conf index 95778a07e1..d555cd0829 100644 --- a/config/sources/riscv64.conf +++ b/config/sources/riscv64.conf @@ -24,6 +24,7 @@ declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"install"}" declare -g NAME_KERNEL="${NAME_KERNEL:-"Image"}" declare -g NAME_INITRD="${NAME_INITRD:-"uInitrd"}" +[[ $ATF_COMPILE != "no" && -z $ATF_COMPILER ]] && ATF_COMPILER="riscv64-linux-gnu-" [[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER='riscv64-linux-gnu-' [[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER='riscv64-linux-gnu-' [[ -z $INITRD_ARCH ]] && INITRD_ARCH=riscv