diff --git a/config/sources/arm64.conf b/config/sources/arm64.conf index ff76cfd58e..f570761394 100644 --- a/config/sources/arm64.conf +++ b/config/sources/arm64.conf @@ -4,20 +4,20 @@ ARCHITECTURE=arm64 ARCH=arm64 KERNEL_IMAGE_TYPE=Image CAN_BUILD_STRETCH=yes -ATF_COMPILER="aarch64-linux-gnu-" +[[ $ATF_COMPILE != "no" && -z $ATF_COMPILER ]] && ATF_COMPILER="aarch64-none-linux-gnu-" [[ $ATF_COMPILE != "no" && -z $ATFSOURCE ]] && ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware' [[ $ATF_COMPILE != "no" && -z $ATFDIR ]] && ATFDIR='arm-trusted-firmware-sunxi-mainline' [[ $ATF_COMPILE != "no" && -z $ATFBRANCH ]] && ATFBRANCH='branch:master' [[ $ATF_COMPILE != "no" && -z $ATF_USE_GCC ]] && ATF_USE_GCC='> 8.0' -[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER="aarch64-linux-gnu-" +[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER="aarch64-none-linux-gnu-" [[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0' [[ -z $BOOTSOURCE ]] && BOOTSOURCE=$MAINLINE_UBOOT_SOURCE [[ -z $BOOTDIR ]] && BOOTDIR=$MAINLINE_UBOOT_DIR [[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2020.04' -[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-linux-gnu-" +[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-none-linux-gnu-" [[ -z $KERNEL_USE_GCC ]] && KERNEL_USE_GCC='> 8.0' [[ -z $KERNELDIR ]] && KERNELDIR=$MAINLINE_KERNEL_DIR [[ -z $KERNELSOURCE ]] && KERNELSOURCE=$MAINLINE_KERNEL_SOURCE diff --git a/config/sources/armhf.conf b/config/sources/armhf.conf index e0fde9090b..a92cd2eb39 100644 --- a/config/sources/armhf.conf +++ b/config/sources/armhf.conf @@ -4,13 +4,13 @@ ARCHITECTURE=arm ARCH=armhf KERNEL_IMAGE_TYPE=Image CAN_BUILD_STRETCH=yes -[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER="arm-linux-gnueabihf-" +[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER="arm-none-linux-gnueabihf-" [[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0' [[ -z $BOOTSOURCE ]] && BOOTSOURCE=$MAINLINE_UBOOT_SOURCE [[ -z $BOOTDIR ]] && BOOTDIR=$MAINLINE_UBOOT_DIR [[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2020.04' -[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="arm-linux-gnueabihf-" +[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="arm-none-linux-gnueabihf-" [[ -z $KERNEL_USE_GCC ]] && KERNEL_USE_GCC='> 8.0' [[ -z $KERNELDIR ]] && KERNELDIR=$MAINLINE_KERNEL_DIR [[ -z $KERNELSOURCE ]] && KERNELSOURCE=$MAINLINE_KERNEL_SOURCE diff --git a/config/sources/families/imx6.conf b/config/sources/families/imx6.conf index 129ab04fa3..2afc5decd7 100644 --- a/config/sources/families/imx6.conf +++ b/config/sources/families/imx6.conf @@ -15,7 +15,6 @@ case $BOARD in SERIALCON=ttymxc1 BOOTSCRIPT="boot-udoo.cmd:boot.cmd" BOOTENV_FILE='udoo.txt' - UBOOT_USE_GCC='< 7.0' ;; diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index 7a9d93e662..22e9b618c1 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -2,6 +2,7 @@ ARCH=armhf BOOTSOURCE='https://github.com/hardkernel/u-boot.git' BOOTBRANCH='branch:odroidc-v2011.03' BOOTDIR='u-boot-odroidc1' +UBOOT_COMPILER="arm-linux-gnueabihf-" UBOOT_USE_GCC='< 4.9' BOOTSCRIPT="boot-odroid-c1.ini:boot.ini" SERIALCON="ttyAML0" diff --git a/config/sources/families/include/mvebu-clearfog.inc b/config/sources/families/include/mvebu-clearfog.inc index 8250e5c82b..6a6dcd2839 100644 --- a/config/sources/families/include/mvebu-clearfog.inc +++ b/config/sources/families/include/mvebu-clearfog.inc @@ -4,21 +4,17 @@ case $BRANCH in # Check https://developer.solid-run.com/knowledge-base/a388-u-boot # for advanced config options - BOOTSOURCE='https://github.com/SolidRun/u-boot' + BOOTSOURCE='https://github.com/SolidRun/u-boot' BOOTBRANCH='branch:v2018.01-solidrun-a38x' BOOTDIR='u-boot-armada' BOOTPATCHDIR='u-boot-clearfog' - BOOTSCRIPT='boot-mvebu.cmd:boot.cmd' - + BOOTSCRIPT='boot-mvebu.cmd:boot.cmd' UBOOT_TARGET_MAP=";sdhc;u-boot-spl-sdhc.kwb:u-boot.mmc ;mmc;u-boot-spl-mmc.kwb:u-boot.emmc ;spi;u-boot-spl-spi.kwb:u-boot.flash ;sata;u-boot-spl-sata.kwb:u-boot.sata ;uart;u-boot-spl-uart.kwb:u-boot.uart" - UBOOT_USE_GCC='> 7.0' - UBOOT_COMPILER='arm-linux-gnueabihf-' - ;; dev) if [[ $BOARD == clearfogbase ]]; then diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 9860f1f9cb..89ec4b8a8b 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -82,6 +82,7 @@ prepare_boot_configuration() UBOOT_TARGET_MAP="BL31=bl31.bin idbloader.img u-boot.itb;;idbloader.img u-boot.itb" ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware' + ATF_COMPILER='aarch64-linux-gnu-' ATFDIR='arm-trusted-firmware' ATFBRANCH='tag:v2.2' ATF_USE_GCC='> 6.3' @@ -112,6 +113,7 @@ prepare_boot_configuration() UBOOT_TARGET_MAP=";;idbloader.bin uboot.img trust.bin" ATFSOURCE='https://github.com/ayufan-rock64/arm-trusted-firmware' + ATF_COMPILER='aarch64-linux-gnu-' ATFDIR='arm-trusted-firmware-rockchip64' ATFBRANCH='branch:rockchip' ATF_USE_GCC='> 6.3' diff --git a/config/sources/families/meson-g12b.conf b/config/sources/families/meson-g12b.conf index 18ee8cb620..27aa1fa0ec 100644 --- a/config/sources/families/meson-g12b.conf +++ b/config/sources/families/meson-g12b.conf @@ -19,8 +19,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/hardkernel/linux' KERNELBRANCH='branch:odroidn2-4.9.y' KERNELDIR='linux-odroidn2' - KERNEL_COMPILER='aarch64-linux-gnu-' - KERNEL_USE_GCC='< 7.0' ;; diff --git a/config/sources/families/meson-sm1.conf b/config/sources/families/meson-sm1.conf index a3534c7ced..11012229df 100644 --- a/config/sources/families/meson-sm1.conf +++ b/config/sources/families/meson-sm1.conf @@ -22,8 +22,6 @@ if [[ $BRANCH == legacy ]]; then KERNELSOURCE='https://github.com/hardkernel/linux' KERNELBRANCH='branch:odroidg12-4.9.y' KERNELDIR='linux-odroid' - KERNEL_COMPILER='aarch64-linux-gnu-' - KERNEL_USE_GCC='< 7.0' # unstable EXT4 support BOOTSIZE="200" BOOTFS_TYPE="fat" diff --git a/config/sources/families/mvebu64.conf b/config/sources/families/mvebu64.conf index 251f0b3e83..633cfa8c8f 100644 --- a/config/sources/families/mvebu64.conf +++ b/config/sources/families/mvebu64.conf @@ -1,7 +1,6 @@ ARCH=arm64 BOOTSOURCE='https://github.com/MarvellEmbeddedProcessors/u-boot-marvell.git' BOOTBRANCH='branch:u-boot-2018.03-armada-18.12' -UBOOT_USE_GCC='> 7.2' BOOTENV_FILE='clearfog-default.txt' ATFSOURCE='https://github.com/MarvellEmbeddedProcessors/atf-marvell' ATFDIR='arm-trusted-firmware-espressobin' @@ -32,7 +31,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/MarvellEmbeddedProcessors/linux-marvell.git' KERNELBRANCH='branch:linux-4.14.22-armada-18.06' KERNELDIR='linux-marvell' - KERNEL_USE_GCC='> 6.3' ;; diff --git a/config/sources/families/odroidxu4.conf b/config/sources/families/odroidxu4.conf index f7110d6423..4d99927b98 100644 --- a/config/sources/families/odroidxu4.conf +++ b/config/sources/families/odroidxu4.conf @@ -4,7 +4,6 @@ BOOTSCRIPT='boot-odroid-xu4.ini:boot.ini' BOOTDIR='u-boot-odroidxu' BOOTBRANCH='branch:odroidxu4-v2017.05' UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/bl2.bin.hardkernel.720k_uboot u-boot-dtb.bin sd_fuse/tzsw.bin.hardkernel' -UBOOT_USE_GCC='> 6.3' case $BRANCH in @@ -12,7 +11,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/hardkernel/linux' KERNELBRANCH='branch:odroidxu4-4.14.y' - KERNEL_USE_GCC='< 7.5' KERNELDIR='linux-odroidxu4' ;; diff --git a/config/sources/families/rk322x.conf b/config/sources/families/rk322x.conf index c621aedc6b..29b8288698 100644 --- a/config/sources/families/rk322x.conf +++ b/config/sources/families/rk322x.conf @@ -2,7 +2,6 @@ BOOTSCRIPT="boot-rk322x.cmd:boot.cmd" BOOTENV_FILE='rk322x.txt' OVERLAY_PREFIX='rk322x' UBOOT_TARGET_MAP="all u-boot.itb;;u-boot-rk322x-with-spl.bin" -UBOOT_USE_GCC='< 9.0' BOOTDELAY=0 BOOTBRANCH='tag:v2020.04' ARCH=armhf @@ -15,7 +14,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/rockchip-linux/kernel.git' KERNELBRANCH='branch:stable-4.4-rk3288-linux-v2.x' KERNELDIR='linux-rockchip' - KERNEL_USE_GCC='> 8.0' ;; diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index 6c84f50981..e3a19e6006 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -3,7 +3,6 @@ BOOTSCRIPT="boot-rockchip.cmd:boot.cmd" BOOTENV_FILE='rockchip.txt' OVERLAY_PREFIX='rockchip' UBOOT_TARGET_MAP=";;$SRC/packages/blobs/rockchip/rk3288_boot.bin u-boot-rockchip-with-spl.bin" -UBOOT_USE_GCC='< 8.0' BOOTDELAY=1 if [[ $BOARD == miqi ]]; then BOOTBRANCH='tag:v2017.11' @@ -22,7 +21,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/rockchip-linux/kernel.git' KERNELBRANCH='branch:stable-4.4-rk3288-linux' KERNELDIR='linux-rockchip' - KERNEL_USE_GCC='< 8.0' ;; diff --git a/config/sources/families/rockchip64.conf b/config/sources/families/rockchip64.conf index 4202f94b09..88ada418df 100644 --- a/config/sources/families/rockchip64.conf +++ b/config/sources/families/rockchip64.conf @@ -9,7 +9,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/ayufan-rock64/linux-kernel' KERNELBRANCH='tag:4.4.202-1237-rockchip-ayufan' KERNELDIR='linux-rockchip64' - KERNEL_USE_GCC='< 8.0' ;; diff --git a/config/sources/families/rockpis.conf b/config/sources/families/rockpis.conf index 5331a1d6db..aae08898c9 100644 --- a/config/sources/families/rockpis.conf +++ b/config/sources/families/rockpis.conf @@ -1,7 +1,9 @@ source "${BASH_SOURCE%/*}/include/rockchip64_common.inc" BOOTSOURCE='https://github.com/piter75/rockchip-u-boot.git' +UBOOT_USE_GCC='< 8.0' BOOTDIR='u-boot-rockchip64' +UBOOT_COMPILER="aarch64-linux-gnu-" BOOTBRANCH='branch:rockpis-next-dev' BOOTPATCHDIR="u-boot-rockchip64" BOOTSCRIPT='boot-rockpis.cmd:boot.cmd' diff --git a/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.asc b/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.asc new file mode 100644 index 0000000000..927fb747a4 --- /dev/null +++ b/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.asc @@ -0,0 +1 @@ +23ecc1dc528253c43e43365c6d923ec3 gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.md5 b/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.md5 new file mode 100644 index 0000000000..927fb747a4 --- /dev/null +++ b/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.md5 @@ -0,0 +1 @@ +23ecc1dc528253c43e43365c6d923ec3 gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.torrent b/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.torrent new file mode 100644 index 0000000000..3df86594a5 Binary files /dev/null and b/config/torrents/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.torrent differ diff --git a/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.asc b/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.asc new file mode 100644 index 0000000000..b8d8d0023a --- /dev/null +++ b/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.asc @@ -0,0 +1 @@ +ae539d09dadacf7f22fcd6f54870e5ad gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz diff --git a/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.md5 b/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.md5 new file mode 100644 index 0000000000..b8d8d0023a --- /dev/null +++ b/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.md5 @@ -0,0 +1 @@ +ae539d09dadacf7f22fcd6f54870e5ad gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz diff --git a/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.torrent b/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.torrent new file mode 100644 index 0000000000..5bd6606ec0 Binary files /dev/null and b/config/torrents/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.torrent differ diff --git a/lib/general.sh b/lib/general.sh index 6a952b8d7c..0380e9c7d7 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -1100,20 +1100,10 @@ prepare_host() "https://dl.armbian.com/_toolchains/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz" "https://dl.armbian.com/_toolchains/gcc-linaro-arm-none-eabi-4.8-2014.04_linux.tar.xz" "https://dl.armbian.com/_toolchains/gcc-linaro-arm-linux-gnueabihf-4.8-2014.04_linux.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-4.9.4-2017.01-x86_64_aarch64-linux-gnu.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabi.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabihf.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-5.5.0-2017.10-x86_64_aarch64-linux-gnu.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-5.5.0-2017.10-x86_64_arm-linux-gnueabi.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-5.5.0-2017.10-x86_64_arm-linux-gnueabihf.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-6.4.1-2017.11-x86_64_arm-linux-gnueabihf.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-6.4.1-2017.11-x86_64_aarch64-linux-gnu.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-linaro-7.4.1-2019.02-x86_64_arm-eabi.tar.xz" "https://dl.armbian.com/_toolchains/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabi.tar.xz" "https://dl.armbian.com/_toolchains/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz" - "https://dl.armbian.com/_toolchains/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz" + "https://dl.armbian.com/_toolchains/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz" + "https://dl.armbian.com/_toolchains/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz" ) for toolchain in ${toolchains[@]}; do