From 675025b7b95c8f90e8ad4e8eb00efb3ff0b964dc Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Thu, 14 Jun 2018 07:42:40 +0200 Subject: [PATCH 1/3] gcc-linaro-arm-linux-gnueabihf: update name and path --- .../package.mk | 8 ++++---- packages/linux/package.mk | 4 ++-- projects/WeTek_Core/options | 2 +- projects/WeTek_Play/options | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename packages/lang/{gcc-linaro-arm-linux-gnuebihf => gcc-linaro-arm-linux-gnueabihf}/package.mk (88%) diff --git a/packages/lang/gcc-linaro-arm-linux-gnuebihf/package.mk b/packages/lang/gcc-linaro-arm-linux-gnueabihf/package.mk similarity index 88% rename from packages/lang/gcc-linaro-arm-linux-gnuebihf/package.mk rename to packages/lang/gcc-linaro-arm-linux-gnueabihf/package.mk index f0c003a4e0..aa350f0bdc 100644 --- a/packages/lang/gcc-linaro-arm-linux-gnuebihf/package.mk +++ b/packages/lang/gcc-linaro-arm-linux-gnueabihf/package.mk @@ -16,7 +16,7 @@ # along with LibreELEC. If not, see . ################################################################################ -PKG_NAME="gcc-linaro-arm-linux-gnuebihf" +PKG_NAME="gcc-linaro-arm-linux-gnueabihf" PKG_VERSION="7.2.1-2017.11" PKG_SHA256="cee0087b1f1205b73996651b99acd3a926d136e71047048f1758ffcec69b1ca2" PKG_ARCH="any" @@ -30,11 +30,11 @@ PKG_LONGDESC="Linaro ARMv8 GNU Linux Binary Toolchain" PKG_TOOLCHAIN="manual" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnuebihf/ - cp -a * $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnuebihf + mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf/ + cp -a * $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf # wrap gcc and g++ with ccache like in gcc package.mk - PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-linaro-arm-linux-gnuebihf/bin/arm-linux-gnueabihf-" + PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real" cat > "${PKG_GCC_PREFIX}gcc" << EOF diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 341477859a..01ac594a5f 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -77,8 +77,8 @@ if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then 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-gnuebihf:host" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-arm-linux-gnuebihf:host" + 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 diff --git a/projects/WeTek_Core/options b/projects/WeTek_Core/options index f6dd1dd20d..6ca0b36cad 100644 --- a/projects/WeTek_Core/options +++ b/projects/WeTek_Core/options @@ -35,7 +35,7 @@ TARGET_FEATURES="32bit" # TARGET_KERNEL_PREFIX - TARGET_KERNEL_RELATIVE_PREFIX="lib/gcc-linaro-arm-linux-gnuebihf/bin/arm-linux-gnueabihf-" + TARGET_KERNEL_RELATIVE_PREFIX="lib/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-" ;; esac diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options index b61ac08897..9d914d95a7 100644 --- a/projects/WeTek_Play/options +++ b/projects/WeTek_Play/options @@ -35,7 +35,7 @@ TARGET_FEATURES="32bit" # TARGET_KERNEL_PREFIX - TARGET_KERNEL_RELATIVE_PREFIX="lib/gcc-linaro-arm-linux-gnuebihf/bin/arm-linux-gnueabihf-" + TARGET_KERNEL_RELATIVE_PREFIX="lib/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-" ;; esac From f28faae2365f683d1d02eb028cf5e6a97fd4d02f Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Thu, 14 Jun 2018 07:42:40 +0200 Subject: [PATCH 2/3] 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 From 4f99564084e788bec9401082803feb738397b8b8 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Thu, 14 Jun 2018 07:42:40 +0200 Subject: [PATCH 3/3] Rockchip: use linaro arm-linux-gnueabihf toolchain --- projects/Rockchip/devices/MiQi/options | 1 + projects/Rockchip/devices/TinkerBoard/options | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/Rockchip/devices/MiQi/options b/projects/Rockchip/devices/MiQi/options index a8615722da..7e3c0d849c 100644 --- a/projects/Rockchip/devices/MiQi/options +++ b/projects/Rockchip/devices/MiQi/options @@ -10,6 +10,7 @@ TARGET_CPU="cortex-a17" TARGET_FPU="neon-vfpv4" TARGET_FEATURES="32bit" + KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf" ;; esac diff --git a/projects/Rockchip/devices/TinkerBoard/options b/projects/Rockchip/devices/TinkerBoard/options index e8371287f2..76a8e4fd34 100644 --- a/projects/Rockchip/devices/TinkerBoard/options +++ b/projects/Rockchip/devices/TinkerBoard/options @@ -10,6 +10,7 @@ TARGET_CPU="cortex-a17" TARGET_FPU="neon-vfpv4" TARGET_FEATURES="32bit" + KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf" ;; esac