From 771d19715b626ed50f26dad9e3f6213532e5604f Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Thu, 14 Apr 2022 19:39:26 +0200
Subject: [PATCH] config: switch aarch64 toolchain

---
 config/path                      | 12 +++---------
 packages/linux/package.mk        |  4 ++--
 packages/tools/atf/package.mk    |  2 +-
 packages/tools/u-boot/package.mk |  2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/config/path b/config/path
index 4a6e042994..2b0be6cead 100644
--- a/config/path
+++ b/config/path
@@ -56,18 +56,12 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 
 . config/optimize
 
-# use ARM toolchain on 64/32 split builds
+# use different toolchain for 64/32 split builds
 if [ -z "$KERNEL_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  if [ "${MACHINE_HARDWARE_NAME}" = "x86_64" ]; then
-    KERNEL_TOOLCHAIN="aarch64-none-linux-gnu"
-  elif [ "${MACHINE_HARDWARE_NAME}" = "aarch64" ]; then
-    KERNEL_TOOLCHAIN="aarch64-none-elf"
-  else
-    die "No known toolchain available for ${MACHINE_HARDWARE_NAME}."
-  fi
+  KERNEL_TOOLCHAIN="aarch64"
 fi
 if [ -n "$KERNEL_TOOLCHAIN" ]; then
-  TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-arm-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN-
+  TARGET_KERNEL_PREFIX=$KERNEL_TOOLCHAIN-none-elf-
 else
   TARGET_KERNEL_PREFIX=$TARGET_PREFIX
 fi
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index d9efed6638..b139baab29 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -38,8 +38,8 @@ esac
 PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die
 
 if [ -n "${KERNEL_TOOLCHAIN}" ]; then
-  PKG_DEPENDS_HOST+=" gcc-arm-${KERNEL_TOOLCHAIN}:host"
-  PKG_DEPENDS_TARGET+=" gcc-arm-${KERNEL_TOOLCHAIN}:host"
+  PKG_DEPENDS_HOST+=" gcc-${KERNEL_TOOLCHAIN}:host"
+  PKG_DEPENDS_TARGET+=" gcc-${KERNEL_TOOLCHAIN}:host"
   HEADERS_ARCH=${TARGET_ARCH}
 fi
 
diff --git a/packages/tools/atf/package.mk b/packages/tools/atf/package.mk
index 3774afde4a..d0798a3ad5 100644
--- a/packages/tools/atf/package.mk
+++ b/packages/tools/atf/package.mk
@@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="ARM Trusted Firmware is a reference implementation of secure world software, including a Secure Monitor executing at Exception Level 3 and various Arm interface standards."
 PKG_TOOLCHAIN="manual"
 
-[ -n "${KERNEL_TOOLCHAIN}" ] && PKG_DEPENDS_TARGET+=" gcc-arm-${KERNEL_TOOLCHAIN}:host"
+[ -n "${KERNEL_TOOLCHAIN}" ] && PKG_DEPENDS_TARGET+=" gcc-${KERNEL_TOOLCHAIN}:host"
 
 make_target() {
   CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" CFLAGS="" make PLAT=${ATF_PLATFORM} bl31
diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index c502d4cd17..1a1de33fe6 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -11,7 +11,7 @@ PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 
 PKG_STAMP="${UBOOT_SYSTEM} ${UBOOT_TARGET}"
 
-[ -n "${KERNEL_TOOLCHAIN}" ] && PKG_DEPENDS_TARGET+=" gcc-arm-${KERNEL_TOOLCHAIN}:host"
+[ -n "${KERNEL_TOOLCHAIN}" ] && PKG_DEPENDS_TARGET+=" gcc-${KERNEL_TOOLCHAIN}:host"
 
 if [ -n "${UBOOT_FIRMWARE}" ]; then
   PKG_DEPENDS_TARGET+=" ${UBOOT_FIRMWARE}"