diff --git a/config/sources/cubox.conf b/config/sources/cubox.conf
index 037315d741..ad0b40aca7 100644
--- a/config/sources/cubox.conf
+++ b/config/sources/cubox.conf
@@ -1,5 +1,5 @@
 BOOTSOURCE='https://github.com/SolidRun/u-boot-imx6'
-BOOTBRANCH='branch:imx6'
+BOOTBRANCH='branch:imx6-next'
 BOOTDIR='u-boot-cubox'
 BOOTSCRIPT='boot-cubox.cmd:boot.cmd'
 BOOTENV_FILE='cubox-default.txt'
@@ -17,19 +17,15 @@ case $BRANCH in
 	;;
 
 	next)
-	# mainline u-boot
-	BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
-	BOOTDIR=$MAINLINE_UBOOT_DIR
-	BOOTBRANCH='tag:v2017.11'
-	BOOTSCRIPT='boot-cubox.cmd:boot.cmd'
-	BOOTENV_FILE='cubox-default.txt'
-	BOOTPATCHDIR='u-boot-cubox-i'
-	BOOTCONFIG="mx6cuboxi_defconfig"
-
+# 	mainline u-boot
+#	BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+#	BOOTDIR=$MAINLINE_UBOOT_DIR
+#	BOOTBRANCH='tag:v2017.11'
+#	BOOTCONFIG="mx6cuboxi_defconfig"
+#	BOOTPATCHDIR='u-boot-cubox-next'
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
 	KERNELBRANCH='branch:linux-4.14.y'
 	KERNELDIR=$MAINLINE_KERNEL_DIR
-	BOOTPATCHDIR='u-boot-cubox-next'
 	KERNEL_USE_GCC='> 7.0'
 	;;