diff --git a/config/sources/mvebu.conf b/config/sources/mvebu.conf
index f3b76ee06a..bfcf2ceae1 100644
--- a/config/sources/mvebu.conf
+++ b/config/sources/mvebu.conf
@@ -25,6 +25,8 @@ case $BRANCH in
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
 	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
 	KERNELDIR=$MAINLINE_KERNEL_DIR
+
+	KERNEL_ALT_GCC='> 6.1'
 	;;
 esac
 
diff --git a/config/sources/odroidxu4.conf b/config/sources/odroidxu4.conf
index b5c47b775f..af230a4226 100644
--- a/config/sources/odroidxu4.conf
+++ b/config/sources/odroidxu4.conf
@@ -24,6 +24,9 @@ case $BRANCH in
 	BOOTDIR=$MAINLINE_UBOOT_DIR
 	BOOTPATCHDIR='u-boot-odroidxu4-next'
 	BOOTENV_FILE='odroidxu4-next.txt'
+
+	UBOOT_ALT_GCC='> 6.1'
+
 	HAS_UUID_SUPPORT=yes
 
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
diff --git a/config/sources/pine64.conf b/config/sources/pine64.conf
index db4fdbe5ca..907a82070b 100644
--- a/config/sources/pine64.conf
+++ b/config/sources/pine64.conf
@@ -1,3 +1,6 @@
+
+source "${BASH_SOURCE%/*}/sunxi64_common.inc"
+
 BOOTSOURCE='https://github.com/zador-blood-stained/u-boot-pine64-armbian.git'
 BOOTDIR='u-boot-pine64'
 
@@ -25,18 +28,15 @@ case $BRANCH in
 	BOOTSCRIPT='boot-pine64-next.cmd:boot.cmd'
 	BOOTENV_FILE='pine64-next.txt'
 	BOOTPATCHDIR='u-boot-pine64-dev'
+	UBOOT_TARGET_MAP=';;u-boot-with-spl.bin'
 
 	KERNELSOURCE='https://github.com/Icenowy/linux'
 	KERNELBRANCH='branch:ice-a64-v6.1'
 	KERNELDIR='linux-pine64-dev'
 	GOVERNOR=schedutil
-	UBOOT_TARGET_MAP=';;u-boot-with-spl.bin'
 	;;
 esac
 
-ARCH=arm64
-KERNEL_IMAGE_TYPE=Image
-
 CPUMIN=480000
 CPUMAX=1200000
 
diff --git a/config/sources/sunxi64_common.inc b/config/sources/sunxi64_common.inc
new file mode 100644
index 0000000000..ce8f4b55b9
--- /dev/null
+++ b/config/sources/sunxi64_common.inc
@@ -0,0 +1,2 @@
+ARCH=arm64
+KERNEL_IMAGE_TYPE=Image