diff --git a/common.sh b/common.sh
index 9834b362a4..3324dfe5b6 100644
--- a/common.sh
+++ b/common.sh
@@ -228,12 +228,12 @@ compile_kernel (){
 		eval ${KERNEL_TOOLCHAIN:+env PATH=$KERNEL_TOOLCHAIN:$PATH} 'make $CTHREADS ARCH=$ARCHITECTURE CROSS_COMPILE="$CROSS_COMPILE" menuconfig'
 	fi
 
-	eval ${KERNEL_TOOLCHAIN:+env PATH=$KERNEL_TOOLCHAIN:$PATH} 'make $CTHREADS ARCH=$ARCHITECTURE CROSS_COMPILE="$CROSS_COMPILE" $TARGETS modules dtbs 2>&1' \
+	eval ${KERNEL_TOOLCHAIN:+env PATH=$KERNEL_TOOLCHAIN:$PATH} 'make $CTHREADS ARCH=$ARCHITECTURE CROSS_COMPILE="$CROSS_COMPILE" $KERNEL_IMAGE_TYPE modules dtbs 2>&1' \
 		${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/compilation.log'} \
 		${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Compiling kernel..." $TTY_Y $TTY_X'} \
 		${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}
 
-	if [[ ${PIPESTATUS[0]} -ne 0 || ! -f arch/$ARCHITECTURE/boot/$TARGETS ]]; then
+	if [[ ${PIPESTATUS[0]} -ne 0 || ! -f arch/$ARCHITECTURE/boot/$KERNEL_IMAGE_TYPE ]]; then
 		exit_with_error "Kernel was not built" "@host"
 	fi
 
diff --git a/config/boards/odroidc1.conf b/config/boards/odroidc1.conf
index dbba3b6a59..1c8eee1bbe 100644
--- a/config/boards/odroidc1.conf
+++ b/config/boards/odroidc1.conf
@@ -1,6 +1,6 @@
 # S805 C1 quad core
 KERNEL_TARGET="default"
-TARGETS=uImage
+KERNEL_IMAGE_TYPE=uImage
 LINUXFAMILY=odroidc1
 BOOTSIZE=32
 BOOTCONFIG=odroidc_config
diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf
index a1879618f9..eb28d1c1a2 100644
--- a/config/boards/odroidc2.conf
+++ b/config/boards/odroidc2.conf
@@ -1,6 +1,6 @@
 # S905 C2 quad core
 ARCH=arm64
-TARGETS=Image
+KERNEL_IMAGE_TYPE=Image
 LINUXFAMILY=odroidc2
 BOOTSIZE=32
 BOOTCONFIG=odroidc2_config
diff --git a/configuration.sh b/configuration.sh
index a4c16d86a0..2d3b2c7f89 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -93,6 +93,7 @@ case $LINUXFAMILY in
 		BOOTLOADER="https://github.com/hardkernel/u-boot.git"
 		BOOTBRANCH="odroidc-v2011.03"
 		BOOTSOURCE="u-boot-odroidc1"
+		UBOOT_NEEDS_GCC="< 5.0"
 	;;
 	
 	odroidc2)
@@ -191,7 +192,7 @@ esac
 
 [[ -z $OFFSET ]] && OFFSET=1 # Bootloader space in MB (1 x 2048 = default)
 [[ -z $ARCH ]] && ARCH=armhf
-[[ -z $TARGETS ]] && TARGETS=zImage
+[[ -z $KERNEL_IMAGE_TYPE ]] && KERNEL_IMAGE_TYPE=zImage
 [[ -z $SERIALCON ]] && SERIALCON=ttyS0
 [[ -z $BOOTSIZE ]] && BOOTSIZE=0 # Mb size of boot partition