From a16579b131d29900a75fc8e1e930e38363d6c2ec Mon Sep 17 00:00:00 2001
From: kszaq <kszaquitto@gmail.com>
Date: Wed, 3 Apr 2019 21:58:32 +0200
Subject: [PATCH] Rename KERNEL_LINARO_TOOLCHAIN to KERNEL_TOOLCHAIN

in case there is a need to use non-Linaro toolchain.
---
 config/path                                   | 8 ++++----
 packages/linux/package.mk                     | 6 +++---
 projects/Rockchip/devices/MiQi/options        | 2 +-
 projects/Rockchip/devices/TinkerBoard/options | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/path b/config/path
index fd0dddc544..831b4614e9 100644
--- a/config/path
+++ b/config/path
@@ -43,11 +43,11 @@ LIB_PREFIX=$SYSROOT_PREFIX/usr
 TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME-
 
 # use linaro toolchain on 64/32 split builds
-if [ -z "$KERNEL_LINARO_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  KERNEL_LINARO_TOOLCHAIN="aarch64-linux-gnu"
+if [ -z "$KERNEL_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
+  KERNEL_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-
+if [ -n "$KERNEL_TOOLCHAIN" ]; then
+  TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN-
 else
   TARGET_KERNEL_PREFIX=$TARGET_PREFIX
 fi
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 05b0fce80b..4e235a653e 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -45,9 +45,9 @@ esac
 
 PKG_KERNEL_CFG_FILE=$(kernel_config_path)
 
-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"
+if [ -n "$KERNEL_TOOLCHAIN" ]; then
+  PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-$KERNEL_TOOLCHAIN:host"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-$KERNEL_TOOLCHAIN:host"
   HEADERS_ARCH=$TARGET_ARCH
 fi
 
diff --git a/projects/Rockchip/devices/MiQi/options b/projects/Rockchip/devices/MiQi/options
index 7e3c0d849c..dacda11285 100644
--- a/projects/Rockchip/devices/MiQi/options
+++ b/projects/Rockchip/devices/MiQi/options
@@ -10,7 +10,7 @@
         TARGET_CPU="cortex-a17"
         TARGET_FPU="neon-vfpv4"
         TARGET_FEATURES="32bit"
-        KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf"
+        KERNEL_TOOLCHAIN="arm-linux-gnueabihf"
         ;;
     esac
 
diff --git a/projects/Rockchip/devices/TinkerBoard/options b/projects/Rockchip/devices/TinkerBoard/options
index 76a8e4fd34..563aa7d36a 100644
--- a/projects/Rockchip/devices/TinkerBoard/options
+++ b/projects/Rockchip/devices/TinkerBoard/options
@@ -10,7 +10,7 @@
         TARGET_CPU="cortex-a17"
         TARGET_FPU="neon-vfpv4"
         TARGET_FEATURES="32bit"
-        KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf"
+        KERNEL_TOOLCHAIN="arm-linux-gnueabihf"
         ;;
     esac