diff --git a/config/sources/mvebu64.conf b/config/sources/mvebu64.conf
index 228c0028c..28ab71b88 100644
--- a/config/sources/mvebu64.conf
+++ b/config/sources/mvebu64.conf
@@ -70,12 +70,14 @@ family_tweaks()
 
 uboot_custom_postprocess()
 {
+	local ATF_COMPILER='arm-linux-gnueabi-'
+	local ATF_USE_GCC='< 6.0'
 	local atfdir="$SRC/cache/sources/$ATFDIR/${ATFBRANCH##*:}"
 	local ubootdir="$SRC/cache/sources/$BOOTDIR/${BOOTBRANCH##*:}"
 	toolchain=$(find_toolchain "$ATF_COMPILER" "$ATF_USE_GCC")
 	cd $atfdir
 	display_alert "Building boot image" "" "info"
-    make DEBUG=1 USE_COHERENT_MEM=0 LOG_LEVEL=20 SECURE=0 CLOCKSPRESET=CPU_800_DDR_800 DDR_TOPOLOGY=2 BOOTDEV=SPINOR PARTNUM=0 PLAT=a3700 all fip BL33=$SRC/cache/sources/$BOOTDIR/${BOOTBRANCH##*:}/u-boot.bin WTP=../../marvell-tools $CTHREADS CROSS_COMPILE=$toolchain$ATF_COMPILER >> $DEST/debug/compilation.log
+    make DEBUG=1 USE_COHERENT_MEM=0 LOG_LEVEL=20 SECURE=0 CLOCKSPRESET=CPU_800_DDR_800 DDR_TOPOLOGY=2 BOOTDEV=SPINOR PARTNUM=0 PLAT=a3700 all fip BL33=$SRC/cache/sources/$BOOTDIR/${BOOTBRANCH##*:}/u-boot.bin WTP=../../marvell-tools $CTHREADS CROSS_CM3=$toolchain/$ATF_COMPILER >> $DEST/debug/compilation.log
 	cp build/a3700/debug/flash-image.bin $ubootdir
 	cd $ubootdir
 }
\ No newline at end of file