diff --git a/packages/lang/gcc-linaro-aarch64-none-elf/package.mk b/packages/lang/gcc-linaro-aarch64-elf/package.mk
similarity index 74%
rename from packages/lang/gcc-linaro-aarch64-none-elf/package.mk
rename to packages/lang/gcc-linaro-aarch64-elf/package.mk
index 800e11c0ce..e63f448f34 100644
--- a/packages/lang/gcc-linaro-aarch64-none-elf/package.mk
+++ b/packages/lang/gcc-linaro-aarch64-elf/package.mk
@@ -16,14 +16,14 @@
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="gcc-linaro-aarch64-none-elf"
-PKG_VERSION="4.9-2014.11-x86_64"
+PKG_NAME="gcc-linaro-aarch64-elf"
+PKG_VERSION="4.9-2016.02"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE=""
-PKG_URL="https://releases.linaro.org/14.11/components/toolchain/binaries/aarch64-none-elf/gcc-linaro-${PKG_VERSION}_aarch64-elf.tar.xz"
-PKG_SOURCE_DIR="gcc-linaro-${PKG_VERSION}_aarch64-elf"
+PKG_URL="https://releases.linaro.org/components/toolchain/binaries/${PKG_VERSION}/aarch64-elf/gcc-linaro-${PKG_VERSION}-x86_64_aarch64-elf.tar.xz"
+PKG_SOURCE_DIR="gcc-linaro-${PKG_VERSION}-x86_64_aarch64-elf"
 PKG_DEPENDS_HOST="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
@@ -38,6 +38,6 @@ make_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-none-elf/
-    cp -a * $ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-none-elf
+  mkdir -p $ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/
+    cp -a * $ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-elf
 }
diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index efe4074589..8f41b9d353 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -27,7 +27,7 @@ elif [ "$UBOOT_VERSION" = "hardkernel" ]; then
   PKG_VERSION="83bf8f0"
   PKG_SITE="https://github.com/hardkernel/u-boot"
   PKG_URL="https://github.com/hardkernel/u-boot/archive/$PKG_VERSION.tar.gz"
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-aarch64-none-elf:host"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-aarch64-elf:host"
 else
   exit 0
 fi
@@ -67,10 +67,10 @@ make_target() {
 
   for UBOOT_TARGET in $UBOOT_CONFIG; do
     if [ "$PROJECT" = "Odroid_C2" ]; then
-      export PATH=$ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-none-elf/bin/:$PATH
-      make CROSS_COMPILE=aarch64-none-elf- ARCH=arm mrproper
-      make CROSS_COMPILE=aarch64-none-elf- ARCH=arm $UBOOT_TARGET
-      make CROSS_COMPILE=aarch64-none-elf- ARCH=arm HOSTCC="$HOST_CC" HOSTSTRIP="true"
+      export PATH=$ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/bin/:$PATH
+      make CROSS_COMPILE=aarch64-elf- ARCH=arm mrproper
+      make CROSS_COMPILE=aarch64-elf- ARCH=arm $UBOOT_TARGET
+      make CROSS_COMPILE=aarch64-elf- ARCH=arm HOSTCC="$HOST_CC" HOSTSTRIP="true"
     else
       make CROSS_COMPILE="$TARGET_PREFIX" ARCH=arm mrproper
       make CROSS_COMPILE="$TARGET_PREFIX" ARCH=arm $UBOOT_TARGET