Skip to content

"get completely rid of dead code toolchain stuff", pt4 - fixes #9256

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

Merged
rpardini merged 3 commits into from
Jan 16, 2026
Merged

"get completely rid of dead code toolchain stuff", pt4 - fixes #9256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d4359c
change-tracking: track most ATF related vars
rpardini Jan 15, 2026
5161987
config: arch: simplify code; always set ATF_COMPILER if unset
rpardini Jan 15, 2026
ca67212
rockchip64_common: emit log at the start of `prepare_boot_configurati…
rpardini Jan 15, 2026
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
4 changes: 2 additions & 2 deletions config/sources/amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ declare -g KERNEL_BUILD_DTBS="no" # amd64 has no DTBs. that I know of.
declare -g KERNEL_IMAGE_TYPE="${KERNEL_IMAGE_TYPE:-"bzImage"}"
declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"install"}"

declare -g KERNEL_COMPILER="x86_64-linux-gnu-"
declare -g UBOOT_COMPILER='x86_64-linux-gnu-'
declare -g KERNEL_COMPILER="${KERNEL_COMPILER:-"x86_64-linux-gnu-"}"
declare -g UBOOT_COMPILER="${UBOOT_COMPILER:-"x86_64-linux-gnu-"}"

true # make sure to exit with 0 status; this protects against shortcircuits etc above.
22 changes: 12 additions & 10 deletions config/sources/arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,18 @@ declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"install"}"
declare -g NAME_KERNEL="${NAME_KERNEL:-"Image"}"
declare -g NAME_INITRD="${NAME_INITRD:-"uInitrd"}"

[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-linux-gnu-"
[[ -z $INITRD_ARCH ]] && INITRD_ARCH=arm64
declare -g ATF_COMPILER="${ATF_COMPILER:-"aarch64-linux-gnu-"}"
declare -g KERNEL_COMPILER="${KERNEL_COMPILER:-"aarch64-linux-gnu-"}"
declare -g UBOOT_COMPILER="${UBOOT_COMPILER:-"aarch64-linux-gnu-"}"
declare -g INITRD_ARCH="${INITRD_ARCH:-"arm64"}"

[[ $ATF_COMPILE != "no" && -z $ATF_COMPILER ]] && ATF_COMPILER="aarch64-linux-gnu-"
[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER="aarch64-linux-gnu-"
[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-linux-gnu-"

# @TODO: Those should best be moved to family code / whatever uses this default instead.
[[ $ATF_COMPILE != "no" && -z $ATFSOURCE ]] && ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
[[ $ATF_COMPILE != "no" && -z $ATFDIR ]] && ATFDIR='arm-trusted-firmware'
[[ $ATF_COMPILE != "no" && -z $ATFBRANCH ]] && ATFBRANCH='commit:af220ebbe467aa580e6b9ba554676f78ffec930f'
if [[ $ATF_COMPILE != "no" ]]; then
# @TODO: rpardini: This shouldn't be here. Who uses this default? Let's move it to family code.
declare -g ATFSOURCE="${ATFSOURCE:-"https://github.com/ARM-software/arm-trusted-firmware"}"
declare -g ATFDIR="${ATFDIR:-"arm-trusted-firmware"}"
declare -g ATFBRANCH="${ATFBRANCH:-"commit:af220ebbe467aa580e6b9ba554676f78ffec930f"}"
else
display_alert "arch code" "ATF_COMPILE is 'no'" "debug"
fi
Comment thread
rpardini marked this conversation as resolved.

true # make sure to exit with 0 status; this protects against shortcircuits etc above.
4 changes: 2 additions & 2 deletions config/sources/armhf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"zinstall"}"
declare -g NAME_KERNEL="${NAME_KERNEL:-"zImage"}"
declare -g NAME_INITRD="${NAME_INITRD:-"uInitrd"}"

[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER='arm-linux-gnueabihf-'
[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER='arm-linux-gnueabihf-'
declare -g KERNEL_COMPILER="${KERNEL_COMPILER:-"arm-linux-gnueabihf-"}"
declare -g UBOOT_COMPILER="${UBOOT_COMPILER:-"arm-linux-gnueabihf-"}"

true # make sure to exit with 0 status; this protects against shortcircuits etc above.
1 change: 1 addition & 0 deletions config/sources/families/include/rockchip64_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ case "$BOOT_SOC" in
esac

prepare_boot_configuration() {
display_alert "Preparing boot configuration" "rockchip64_common::prepare_boot_configuration()" "info"
ATFSOURCE=''
ATF_COMPILE='no'
case "$BOOT_SCENARIO" in
Expand Down
4 changes: 2 additions & 2 deletions config/sources/loong64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"install"}"
declare -g NAME_KERNEL="${NAME_KERNEL:-"vmlinux"}"
declare -g NAME_INITRD="${NAME_INITRD:-"initrd.img"}"

[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER='loongarch64-linux-gnu-'
[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER='loongarch64-linux-gnu-'
declare -g KERNEL_COMPILER="${KERNEL_COMPILER:-"loongarch64-linux-gnu-"}"
declare -g UBOOT_COMPILER="${UBOOT_COMPILER:-"loongarch64-linux-gnu-"}"

true # make sure to exit with 0 status; this protects against shortcircuits etc above.
8 changes: 4 additions & 4 deletions config/sources/riscv64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ 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
declare -g ATF_COMPILER="${ATF_COMPILER:-"riscv64-linux-gnu-"}"
declare -g KERNEL_COMPILER="${KERNEL_COMPILER:-"riscv64-linux-gnu-"}"
declare -g UBOOT_COMPILER="${UBOOT_COMPILER:-"riscv64-linux-gnu-"}"
declare -g INITRD_ARCH="${INITRD_ARCH:-"riscv"}"

true # make sure to exit with 0 status; this protects against shortcircuits etc above.
2 changes: 1 addition & 1 deletion lib/functions/configuration/change-tracking.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ function track_general_config_variables() {
track_config_variables "${1}" BOARDFAMILY KERNELSOURCE KERNEL_MAJOR_MINOR KERNELBRANCH KERNEL_DESCRIPTION LINUXFAMILY LINUXCONFIG KERNELPATCHDIR KERNEL_PATCH_ARCHIVE_BASE
array_values="yes" track_config_variables "${1}" KERNEL_DRIVERS_SKIP
track_config_variables "${1}" BOOTSOURCE BOOTSOURCEDIR BOOTBRANCH BOOTPATCHDIR BOOTDIR BOOTCONFIG BOOTBRANCH_BOARD BOOTPATCHDIR_BOARD
track_config_variables "${1}" ATFSOURCEDIR ATFDIR ATFBRANCH CRUSTSOURCEDIR CRUSTDIR CRUSTBRANCH LINUXSOURCEDIR
track_config_variables "${1}" ATF_COMPILE ATF_COMPILER ATFSOURCE ATFSOURCEDIR ATFDIR ATFBRANCH CRUSTSOURCEDIR CRUSTDIR CRUSTBRANCH LINUXSOURCEDIR
track_config_variables "${1}" NETWORKING_STACK SKIP_ARMBIAN_REPO
}