"get completely rid of dead code toolchain stuff", pt3

config/sources/amd64.conf

@@ -27,10 +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"}"
 
-if [[ "$(uname -m)" == "aarch64" ]]; then
-	# Allow building amd64 on aarch64, but using system toolchain only
-	declare -g KERNEL_COMPILER="x86_64-linux-gnu-"
-	declare -g UBOOT_COMPILER='x86_64-linux-gnu-'
-fi
+declare -g KERNEL_COMPILER="x86_64-linux-gnu-"
+declare -g UBOOT_COMPILER='x86_64-linux-gnu-'
 
 true # make sure to exit with 0 status; this protects against shortcircuits etc above.

config/sources/arm64.conf

@@ -26,24 +26,13 @@ declare -g NAME_INITRD="${NAME_INITRD:-"uInitrd"}"
 [[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-linux-gnu-"
 [[ -z $INITRD_ARCH ]] && INITRD_ARCH=arm64
 
-if [ "$(uname -m)" = "aarch64" ]; then
-	[[ $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-"
-else
-	[[ $ATF_COMPILE != "no" && -z $ATF_COMPILER ]] && ATF_COMPILER="aarch64-none-linux-gnu-"
-	[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER="aarch64-none-linux-gnu-"
-	[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-linux-gnu-"
-
-	export QEMU_CPU="cortex-a53"
-fi
+[[ $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'
 
-# System toolchains don't have the -none- variant, remove it
-UBOOT_COMPILER="${UBOOT_COMPILER//-none-/-}"
-ATF_COMPILER="${ATF_COMPILER//-none-/-}"
-
 true # make sure to exit with 0 status; this protects against shortcircuits etc above.

config/sources/armhf.conf

@@ -25,17 +25,6 @@ declare -g NAME_KERNEL="${NAME_KERNEL:-"zImage"}"
 declare -g NAME_INITRD="${NAME_INITRD:-"uInitrd"}"
 
 [[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER='arm-linux-gnueabihf-'
-
-if [ "$(uname -m)" = "aarch64" ]; then
-	[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER='arm-linux-gnueabihf-'
-else
-	# > 9.2 https://armbian.atlassian.net/browse/AR-557
-	#[[ -z $KERNEL_COMPILER ]]      && KERNEL_COMPILER="arm-none-linux-gnueabihf-"
-	[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER='arm-none-linux-gnueabihf-'
-fi
-
-# System toolchains don't have the -none- variant, remove it
-UBOOT_COMPILER="${UBOOT_COMPILER//-none-/-}"
-ATF_COMPILER="${ATF_COMPILER//-none-/-}"
+[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER='arm-linux-gnueabihf-'
 
 true # make sure to exit with 0 status; this protects against shortcircuits etc above.

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"

config/sources/families/include/rockchip64_common.inc

@@ -167,7 +167,6 @@ prepare_boot_configuration() {
 			UBOOT_TARGET_MAP="BL31=bl31.elf idbloader.img u-boot.itb;;idbloader.img u-boot.itb"
 			ATF_COMPILE=yes
 			ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
-			ATF_COMPILER='aarch64-linux-gnu-'
 			ATFDIR='arm-trusted-firmware'
 			ATFBRANCH='tag:v2.13.0' # also adapt ATFPATCHDIR when changing this
 			ATFPATCHDIR='atf-rockchip64/v2.13' # there's also v2.14 patches ready

config/sources/families/mvebu64.conf

@@ -30,8 +30,6 @@ declare -g ATFSOURCE='https://git.trustedfirmware.org/TF-A/trusted-firmware-a.gi
 declare -g ATFDIR='arm-trusted-firmware-espressobin'
 declare -g ATFBRANCH='tag:lts-v2.12.8'
 
-ATF_COMPILER='aarch64-linux-gnu-'
-
 if [[ $BOARD = macchiatobin-doubleshot ]]; then
 	export SCP_BL2=$SRC/cache/sources/marvell-binaries/mrvl_scp_bl2.img # ATTENTION! This is actually a required 'export', since it's picked up by ATF's make.
 

config/sources/families/nuvoton-ma35d1.conf

@@ -28,7 +28,6 @@ declare -g BOOTDIR='u-boot-nuvoton-ma35d1'
 declare -g UBOOT_TARGET_MAP=";;u-boot.bin header.bin fip.bin bl2.bin bl31.bin bl2-ma35d1.dtb tee-header_v2.bin tee-pager_v2.bin"
 
 # TF-A source from Nuvoton
-declare -g ATF_USE_GCC="> 8.0"
 declare -g ATFSOURCE="https://github.com/OpenNuvoton/MA35D1_arm-trusted-firmware-v2.3.git"
 declare -g ATFDIR="arm-trusted-firmware-ma35d1"
 declare -g ATFBRANCH="branch:master"

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"

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

lib/functions/artifacts/artifact-uboot.sh

@@ -99,7 +99,7 @@ function artifact_uboot_prepare_version() {
 		"${BOOTDELAY}" "${UBOOT_DEBUGGING}" "${UBOOT_TARGET_MAP}"        # general for all families
 		"${BOOT_SCENARIO}" "${BOOT_SUPPORT_SPI}" "${BOOT_SOC}"           # rockchip stuff, sorry.
 		"${DDR_BLOB}" "${BL31_BLOB}" "${BL32_BLOB}" "${MINILOADER_BLOB}" # More rockchip stuff, even more sorry.
-		"${ATF_COMPILE}" "${ATFBRANCH}" "${ATFPATCHDIR}"                 # arm-trusted-firmware stuff
+		"${ATF_COMPILE}" "${ATFSOURCE}" "${ATFBRANCH}" "${ATFPATCHDIR}"  # arm-trusted-firmware stuff
 		"${CRUSTCONFIG}" "${CRUSTBRANCH}" "${CRUSTPATCHDIR}"             # crust stuff
 		"${IMAGE_PARTITION_TABLE}" "${BOOT_FDT_FILE}" "${SERIALCON}"     # image and kernel related, to be used as reference/docs
 		"${SRC_EXTLINUX}" "${SRC_CMDLINE}"                               # image and kernel related, to be used as reference/docs

lib/tools/info/inventory-boards-csv.py

@@ -175,6 +175,8 @@ def flatten(d, parent_key='', sep='_'):
 	'out.BOOTCONFIG',
 	'out.BOOT_SOC',
 	'out.ATF_COMPILE',
+	'out.ATFSOURCE',
+	'out.ATFBRANCH',
 	'out.KERNEL_MAJOR_MINOR',
 	'out.BOOTBRANCH',
 	'out.BOOT_SCENARIO',