From f28faae2365f683d1d02eb028cf5e6a97fd4d02f Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Thu, 14 Jun 2018 07:42:40 +0200
Subject: [PATCH] linux: use linaro toolchain when KERNEL_LINARO_TOOLCHAIN is
 set

---
 config/path                 | 13 ++++++-------
 packages/linux/package.mk   | 11 +++--------
 projects/WeTek_Core/options |  4 ++--
 projects/WeTek_Play/options |  4 ++--
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/config/path b/config/path
index 71dfdb78e5..dc2f3e6e8b 100644
--- a/config/path
+++ b/config/path
@@ -38,14 +38,13 @@ LIB_PREFIX=$SYSROOT_PREFIX/usr
 TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME-
 
 # use linaro toolchain on 64/32 split builds
-if [ -z "$TARGET_KERNEL_RELATIVE_PREFIX" ]; then
-  if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-    TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-
-  else
-    TARGET_KERNEL_PREFIX=$TARGET_PREFIX
-  fi
+if [ -z "$KERNEL_LINARO_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
+  KERNEL_LINARO_TOOLCHAIN="aarch64-linux-gnu"
+fi
+if [ -n "$KERNEL_LINARO_TOOLCHAIN" ]; then
+  TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-$KERNEL_LINARO_TOOLCHAIN/bin/$KERNEL_LINARO_TOOLCHAIN-
 else
-  TARGET_KERNEL_PREFIX="$TOOLCHAIN/$TARGET_KERNEL_RELATIVE_PREFIX"
+  TARGET_KERNEL_PREFIX=$TARGET_PREFIX
 fi
 
 FAKEROOT_SCRIPT=$BUILD/.fakeroot
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 01ac594a5f..d8d6d60c25 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -70,17 +70,12 @@ esac
 
 PKG_KERNEL_CFG_FILE=$(kernel_config_path)
 
-if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-aarch64-linux-gnu:host"
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-aarch64-linux-gnu:host"
+if [ -n "$KERNEL_LINARO_TOOLCHAIN" ]; then
+  PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-$KERNEL_LINARO_TOOLCHAIN:host"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-$KERNEL_LINARO_TOOLCHAIN:host"
   HEADERS_ARCH=$TARGET_ARCH
 fi
 
-if [ "$LINUX" = "amlogic-3.10" -a "$TARGET_KERNEL_ARCH" = "arm" -a "$TARGET_ARCH" = "arm" ]; then
-  PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-arm-linux-gnueabihf:host"
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-arm-linux-gnueabihf:host"
-fi
-
 if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG_FILE ; then
   PKG_BUILD_PERF="yes"
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET binutils elfutils libunwind zlib openssl"
diff --git a/projects/WeTek_Core/options b/projects/WeTek_Core/options
index 6ca0b36cad..daf0b0e2f0 100644
--- a/projects/WeTek_Core/options
+++ b/projects/WeTek_Core/options
@@ -34,8 +34,8 @@
         TARGET_FPU="neon-fp16"
         TARGET_FEATURES="32bit"
 
-        # TARGET_KERNEL_PREFIX
-        TARGET_KERNEL_RELATIVE_PREFIX="lib/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-"
+        # Use linaro toolchain to build kernel
+        KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf"
         ;;
     esac
 
diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options
index 9d914d95a7..58cfeedf4f 100644
--- a/projects/WeTek_Play/options
+++ b/projects/WeTek_Play/options
@@ -34,8 +34,8 @@
         TARGET_FPU="neon-fp16"
         TARGET_FEATURES="32bit"
 
-        # TARGET_KERNEL_PREFIX
-        TARGET_KERNEL_RELATIVE_PREFIX="lib/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-"
+        # Use linaro toolchain to build kernel
+        KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf"
         ;;
     esac