diff --git a/config/sources/arm64.conf b/config/sources/arm64.conf index 0457dc793..2e2381c15 100644 --- a/config/sources/arm64.conf +++ b/config/sources/arm64.conf @@ -15,7 +15,7 @@ ATF_COMPILER="aarch64-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:v2019.04' +[[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2019.10' [[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-linux-gnu-" [[ -z $KERNEL_USE_GCC ]] && KERNEL_USE_GCC='> 8.0' diff --git a/config/sources/armhf.conf b/config/sources/armhf.conf index 5491b9bc2..6bc466834 100644 --- a/config/sources/armhf.conf +++ b/config/sources/armhf.conf @@ -8,7 +8,7 @@ CAN_BUILD_STRETCH=yes [[ -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:v2019.04' +[[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2019.10' [[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="arm-linux-gnueabihf-" [[ -z $KERNEL_USE_GCC ]] && KERNEL_USE_GCC='> 8.0' diff --git a/config/sources/families/imx6.conf b/config/sources/families/imx6.conf index 188ca8651..7971af1c2 100644 --- a/config/sources/families/imx6.conf +++ b/config/sources/families/imx6.conf @@ -9,7 +9,6 @@ case $BOARD in udoo) SERIALCON=ttymxc1 - BOOTBRANCH='tag:v2019.10' BOOTSCRIPT="boot-udoo.cmd:boot.cmd" BOOTENV_FILE='udoo-default.txt' UBOOT_USE_GCC='< 7.0' diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index 8e0362fe9..ccb1fc92f 100644 --- a/config/sources/families/include/meson64_common.inc +++ b/config/sources/families/include/meson64_common.inc @@ -1,10 +1,8 @@ -BOOTBRANCH='tag:v2019.07' UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin.sd.bin:u-boot.bin u-boot-dtb.img" BOOTSCRIPT="boot-meson64.cmd:boot.cmd" BOOTENV_FILE='meson64-next.txt' LINUXFAMILY=meson64 ARCH=arm64 -BOOTBRANCH='tag:v2019.10' SERIALCON=ttyAML0 SRC_LOADADDR='LOADADDR=0x1080000' OVERLAY_PREFIX='meson' diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index f5c56f585..7fbad4d58 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -24,7 +24,6 @@ case $BRANCH in dev) - BOOTBRANCH='tag:v2019.10' KERNELSOURCE="https://github.com/megous/linux" KERNELBRANCH="branch:orange-pi-5.4" KERNELPATCHDIR='sunxi-'$BRANCH diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 16a2ebe21..b6b0f7af4 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -26,7 +26,6 @@ case $BRANCH in dev) - BOOTBRANCH='tag:v2019.10' KERNELSOURCE="https://github.com/megous/linux" KERNELBRANCH="branch:orange-pi-5.4" KERNELPATCHDIR='sunxi-dev' diff --git a/config/sources/families/mt7623.conf b/config/sources/families/mt7623.conf index cdb2a5749..03855cd79 100644 --- a/config/sources/families/mt7623.conf +++ b/config/sources/families/mt7623.conf @@ -1,7 +1,6 @@ BOOTSCRIPT='boot-mt7623.cmd:boot.cmd' BOOTENV_FILE='mt7623-default.txt' UBOOT_TARGET_MAP=";;$SRC/packages/blobs/mt7623n/BPI-R2-HEAD440-0k.img $SRC/packages/blobs/mt7623n/BPI-R2-HEAD1-512b.img $SRC/packages/blobs/mt7623n/BPI-R2-preloader-2k.img $SRC/packages/blobs/mt7623n/BPI-R2-EMMC-boot0-0K-0905.img u-boot.bin" -BOOTBRANCH='tag:v2019.10' BOOTPATCHDIR='u-boot-mt7623' case $BRANCH in diff --git a/config/sources/families/rk3399.conf b/config/sources/families/rk3399.conf index b1c2a8a97..6d669dfd2 100644 --- a/config/sources/families/rk3399.conf +++ b/config/sources/families/rk3399.conf @@ -1,7 +1,6 @@ source "${BASH_SOURCE%/*}/include/rockchip64_common.inc" BOOTPATCHDIR="u-boot-rk3399" -BOOTBRANCH='tag:v2019.10' case $BRANCH in