diff --git a/config/path b/config/path
index d04b6f8ce0..64a592d9a9 100644
--- a/config/path
+++ b/config/path
@@ -44,7 +44,7 @@ TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME-
 
 # use ARM toolchain on 64/32 split builds
 if [ -z "$KERNEL_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  KERNEL_TOOLCHAIN="aarch64-linux-gnu"
+  KERNEL_TOOLCHAIN="aarch64-none-linux-gnu"
 fi
 if [ -n "$KERNEL_TOOLCHAIN" ]; then
   TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-arm-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN-
diff --git a/packages/lang/gcc-arm-aarch64-linux-gnu/package.mk b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
similarity index 58%
rename from packages/lang/gcc-arm-aarch64-linux-gnu/package.mk
rename to packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
index e7f3456946..e8d85f1030 100644
--- a/packages/lang/gcc-arm-aarch64-linux-gnu/package.mk
+++ b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
@@ -1,22 +1,22 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
-PKG_NAME="gcc-arm-aarch64-linux-gnu"
-PKG_VERSION="8.3-2019.03"
-PKG_SHA256="8ce3e7688a47d8cd2d8e8323f147104ae1c8139520eca50ccf8a7fa933002731"
+PKG_NAME="gcc-arm-aarch64-none-linux-gnu"
+PKG_VERSION="9.2-2019.12"
+PKG_SHA256="8dfe681531f0bd04fb9c53cf3c0a3368c616aa85d48938eebe2b516376e06a66"
 PKG_LICENSE="GPL"
-PKG_SITE=""
-PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-aarch64-linux-gnu.tar.xz"
+PKG_SITE="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a"
+PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-aarch64-none-linux-gnu.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu/
-    cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu
+  mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu/
+    cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu
 
   # wrap gcc and g++ with ccache like in gcc package.mk
-  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu/bin/aarch64-linux-gnu-"
+  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-"
 
   cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
 cat > "${PKG_GCC_PREFIX}gcc" << EOF
diff --git a/packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk b/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk
similarity index 53%
rename from packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk
rename to packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk
index 39107d5a30..40a20b403c 100644
--- a/packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk
+++ b/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk
@@ -1,22 +1,22 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
-PKG_NAME="gcc-arm-arm-linux-gnueabihf"
-PKG_VERSION="8.3-2019.03"
-PKG_SHA256="d4f6480ecaa99e977e3833cc8a8e1263f9eecd1ce2d022bb548a24c4f32670f5"
+PKG_NAME="gcc-arm-arm-none-linux-gnueabihf"
+PKG_VERSION="9.2-2019.12"
+PKG_SHA256="51bbaf22a4d3e7a393264c4ef1e45566701c516274dde19c4892c911caa85617"
 PKG_LICENSE="GPL"
-PKG_SITE=""
-PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-arm-linux-gnueabihf.tar.xz"
+PKG_SITE="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a"
+PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-arm-none-linux-gnueabihf.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_LONGDESC="ARM GNU Linux Binary Toolchain"
+PKG_LONGDESC="ARM AArch32 GNU Linux Binary Toolchain"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf/
-    cp -a * $TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf
+  mkdir -p $TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf/
+    cp -a * $TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf
 
   # wrap gcc and g++ with ccache like in gcc package.mk
-  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-"
+  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-"
 
   cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
 cat > "${PKG_GCC_PREFIX}gcc" << EOF
diff --git a/packages/lang/gcc-linaro-aarch64-elf/package.mk b/packages/lang/gcc-linaro-aarch64-elf/package.mk
deleted file mode 100644
index 1f0132b4e5..0000000000
--- a/packages/lang/gcc-linaro-aarch64-elf/package.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="gcc-linaro-aarch64-elf"
-PKG_VERSION="4.9.4-2017.01"
-PKG_SHA256="00c79aaf7ff9b1c22f7b0443a730056b3936561a4206af187ef61a4e3cab1716"
-PKG_LICENSE="GPL"
-PKG_SITE=""
-PKG_URL="https://releases.linaro.org/components/toolchain/binaries/4.9-2017.01/aarch64-elf/gcc-linaro-${PKG_VERSION}-x86_64_aarch64-elf.tar.xz"
-PKG_DEPENDS_HOST="ccache:host"
-PKG_LONGDESC="Linaro Aarch64 GNU Linux Binary Toolchain"
-PKG_TOOLCHAIN="manual"
-
-makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-linaro-aarch64-elf/
-    cp -a * $TOOLCHAIN/lib/gcc-linaro-aarch64-elf
-}
diff --git a/packages/lang/gcc-linaro-arm-eabi/package.mk b/packages/lang/gcc-linaro-arm-eabi/package.mk
deleted file mode 100644
index 68026915a9..0000000000
--- a/packages/lang/gcc-linaro-arm-eabi/package.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="gcc-linaro-arm-eabi"
-PKG_VERSION="4.9.4-2017.01"
-PKG_SHA256="5fa170a74db172dca098c70ae58f4c08d2fca0232ce135530b2ef4996326b4bd"
-PKG_LICENSE="GPL"
-PKG_SITE=""
-PKG_URL="https://releases.linaro.org/components/toolchain/binaries/4.9-2017.01/arm-eabi/gcc-linaro-${PKG_VERSION}-x86_64_arm-eabi.tar.xz"
-PKG_DEPENDS_HOST="ccache:host"
-PKG_LONGDESC="Linaro ARM GNU Linux Binary Toolchain"
-PKG_TOOLCHAIN="manual"
-
-makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-eabi/
-    cp -a * $TOOLCHAIN/lib/gcc-linaro-arm-eabi
-}
diff --git a/projects/Rockchip/devices/RK3288/options b/projects/Rockchip/devices/RK3288/options
index 99d2d28945..0e1dcaed95 100644
--- a/projects/Rockchip/devices/RK3288/options
+++ b/projects/Rockchip/devices/RK3288/options
@@ -10,7 +10,7 @@
         TARGET_CPU="cortex-a17"
         TARGET_FPU="neon-vfpv4"
         TARGET_FEATURES="32bit"
-        KERNEL_TOOLCHAIN="arm-linux-gnueabihf"
+        KERNEL_TOOLCHAIN="arm-none-linux-gnueabihf"
         ;;
     esac