diff --git a/config/boards/bananapim2plus.conf b/config/boards/bananapim2plus.conf
index 58e133fb5c..70033f1fd6 100644
--- a/config/boards/bananapim2plus.conf
+++ b/config/boards/bananapim2plus.conf
@@ -3,9 +3,8 @@ LINUXFAMILY=sun8i
 BOOTCONFIG=Sinovoip_BPI_M2_plus_defconfig
 MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #ap6211"
 MODULES_NEXT="brcmfmac"
-CPUMIN="240000"
-CPUMAX="1200000"
-GOVERNOR=interactive
+CPUMIN=240000
+CPUMAX=1200000
 CLI_TARGET="jessie:default"
 DESKTOP_TARGET="jessie:default"
 KERNEL_TARGET="default,dev"
\ No newline at end of file
diff --git a/config/boards/cubieboard4.conf b/config/boards/cubieboard4.conf
index 18c44bcd2c..6df3259a92 100644
--- a/config/boards/cubieboard4.conf
+++ b/config/boards/cubieboard4.conf
@@ -2,8 +2,5 @@
 KERNEL_TARGET="next,dev"
 LINUXFAMILY=sun9i
 BOOTCONFIG=Cubieboard4_defconfig
-CPUMIN=1200000
-CPUMAX=1800000
-GOVERNOR=ondemand
 CLI_TARGET=""
 DESKTOP_TARGET=""
\ No newline at end of file
diff --git a/config/boards/nanopim1.conf b/config/boards/nanopim1.conf
index 70cab07a22..4bba403956 100644
--- a/config/boards/nanopim1.conf
+++ b/config/boards/nanopim1.conf
@@ -3,9 +3,8 @@ LINUXFAMILY=sun8i
 BOOTCONFIG=FriendlyARM_NanoPi_M1_defconfig
 MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #ap6211"
 MODULES_NEXT="brcmfmac"
-CPUMIN="240000"
-CPUMAX="1200000"
-GOVERNOR=interactive
+CPUMIN=240000
+CPUMAX=1200000
 CLI_TARGET="jessie:default,dev"
 DESKTOP_TARGET="jessie:default"
 KERNEL_TARGET="default,dev"
\ No newline at end of file
diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf
index eb28d1c1a2..ede567bdd0 100644
--- a/config/boards/odroidc2.conf
+++ b/config/boards/odroidc2.conf
@@ -6,9 +6,6 @@ BOOTSIZE=32
 BOOTCONFIG=odroidc2_config
 MODULES="bonding"
 MODULES_NEXT=""
-CPUMIN="500000"
-CPUMAX="2016000"
-GOVERNOR=conservative
 SERIALCON=ttyS0
 CLI_TARGET="jessie:default"
 DESKTOP_TARGET="jessie:default"
diff --git a/config/boards/orangepih3.conf b/config/boards/orangepih3.conf
index 1b0f799ae8..fdb0739bec 100644
--- a/config/boards/orangepih3.conf
+++ b/config/boards/orangepih3.conf
@@ -3,9 +3,8 @@ LINUXFAMILY=sun8i
 BOOTCONFIG=orangepi_h3_defconfig
 MODULES="8189es #gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #gc2035"
 MODULES_NEXT=""
-CPUMIN="480000"
-CPUMAX="1296000"
-GOVERNOR=interactive
+CPUMIN=480000
+CPUMAX=1296000
 CLI_TARGET="jessie:default,dev"
 DESKTOP_TARGET="jessie:default"
 KERNEL_TARGET="default,dev"
\ No newline at end of file
diff --git a/config/boards/orangepiplus.conf b/config/boards/orangepiplus.conf
index f7d150d9a9..40be834fe2 100644
--- a/config/boards/orangepiplus.conf
+++ b/config/boards/orangepiplus.conf
@@ -3,9 +3,8 @@ LINUXFAMILY=sun8i
 BOOTCONFIG=orangepi_plus_defconfig
 MODULES="8189es #gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #gc2035"
 MODULES_NEXT=""
-CPUMIN="480000"
-CPUMAX="1296000"
-GOVERNOR=interactive
+CPUMIN=480000
+CPUMAX=1296000
 CLI_TARGET="jessie:default,dev"
 DESKTOP_TARGET="jessie:default"
 KERNEL_TARGET="default,dev"
\ No newline at end of file
diff --git a/config/sources/cubox.conf b/config/sources/cubox.conf
new file mode 100644
index 0000000000..0b56c9b9e3
--- /dev/null
+++ b/config/sources/cubox.conf
@@ -0,0 +1,28 @@
+
+BOOTLOADER='https://github.com/SolidRun/u-boot-imx6'
+BOOTBRANCH='imx6'
+BOOTSOURCE='u-boot-cubox'
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/linux4kix/linux-linaro-stable-mx6'
+	KERNELBRANCH='linux-linaro-lsk-v3.14-mx6'
+	LINUXSOURCE='linux-cubox'
+	;;
+
+	next)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+	;;
+
+	dev)
+	LINUXKERNEL='https://github.com/SolidRun/linux-fslc'
+	KERNELBRANCH='3.14-1.0.x-mx6-sr'
+	LINUXSOURCE='linux-cubox'
+	;;
+esac
+
+CPUMIN=396000
+CPUMAX=996000
+GOVERNOR=interactive
diff --git a/config/sources/marvell.conf b/config/sources/marvell.conf
new file mode 100644
index 0000000000..dc444b287f
--- /dev/null
+++ b/config/sources/marvell.conf
@@ -0,0 +1,28 @@
+
+BOOTLOADER='https://github.com/SolidRun/u-boot-armada38x'
+BOOTBRANCH='u-boot-2013.01-15t1-clearfog'
+BOOTSOURCE='u-boot-armada'
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/SolidRun/linux-armada38x'
+	KERNELBRANCH='linux-3.10.70-15t1-clearfog'
+	LINUXSOURCE='linux-armada'
+	;;
+
+	next)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+	;;
+
+	dev)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=''
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+	;;
+esac
+
+CPUMIN=800000
+CPUMAX=1600000
+GOVERNOR=ondemand
diff --git a/config/sources/neo.conf b/config/sources/neo.conf
new file mode 100644
index 0000000000..cb112734eb
--- /dev/null
+++ b/config/sources/neo.conf
@@ -0,0 +1,14 @@
+
+BOOTLOADER="https://github.com/UDOOboard/uboot-imx"
+BOOTBRANCH="2015.04.imx-neo"
+BOOTSOURCE="u-boot-neo"
+
+LINUXKERNEL='https://github.com/UDOOboard/linux_kernel'
+#KERNELBRANCH="imx_3.14.28_1.0.0_ga_neo"
+KERNELBRANCH="3.14-1.0.x-udoo"
+#LINUXSOURCE="linux-udoo-neo"
+LINUXSOURCE="linux-udoo"
+
+CPUMIN=392000
+CPUMAX=996000
+GOVERNOR=interactive
diff --git a/config/sources/odroidc1.conf b/config/sources/odroidc1.conf
new file mode 100644
index 0000000000..a75149830e
--- /dev/null
+++ b/config/sources/odroidc1.conf
@@ -0,0 +1,23 @@
+
+BOOTLOADER='https://github.com/hardkernel/u-boot.git'
+BOOTBRANCH='odroidc-v2011.03'
+BOOTSOURCE='u-boot-odroidc1'
+UBOOT_NEEDS_GCC='< 5.0'
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/hardkernel/linux'
+	KERNELBRANCH='odroidc-3.10.y'
+	LINUXSOURCE='linux-odroidc1'
+	;;
+
+	next)
+	LINUXKERNEL='https://github.com/tobetter/linux'
+	KERNELBRANCH='odroidxu4-v4.2'
+	LINUXSOURCE='linux-odroidxu-next'
+	;;
+esac
+
+CPUMIN=504000
+CPUMAX=1728000
+GOVERNOR=interactive
diff --git a/config/sources/odroidc2.conf b/config/sources/odroidc2.conf
new file mode 100644
index 0000000000..91967b1635
--- /dev/null
+++ b/config/sources/odroidc2.conf
@@ -0,0 +1,12 @@
+
+BOOTLOADER='https://github.com/hardkernel/u-boot.git'
+BOOTBRANCH='odroidc2-v2015.01'
+BOOTSOURCE='u-boot-odroidc2'
+
+LINUXKERNEL='https://github.com/hardkernel/linux'
+KERNELBRANCH='odroidc2-3.14.y'
+LINUXSOURCE='linux-odroidc2'
+
+CPUMIN=500000
+CPUMAX=2016000
+GOVERNOR=conservative
diff --git a/config/sources/odroidxu4.conf b/config/sources/odroidxu4.conf
new file mode 100644
index 0000000000..f711763617
--- /dev/null
+++ b/config/sources/odroidxu4.conf
@@ -0,0 +1,22 @@
+
+BOOTLOADER='https://github.com/hardkernel/u-boot.git'
+BOOTBRANCH='odroidxu3-v2012.07'
+BOOTSOURCE='u-boot-odroidxu'
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/hardkernel/linux'
+	KERNELBRANCH='odroidxu3-3.10.y'
+	LINUXSOURCE='linux-odroidxu4'
+	;;
+
+	next)
+	LINUXKERNEL='https://github.com/tobetter/linux'
+	KERNELBRANCH='odroidxu4-v4.2'
+	LINUXSOURCE='linux-odroidxu-next'
+	;;
+esac
+
+CPUMIN=600000
+CPUMAX=2000000
+GOVERNOR=conservative
diff --git a/config/sources/s500.conf b/config/sources/s500.conf
new file mode 100644
index 0000000000..2ada27e9b9
--- /dev/null
+++ b/config/sources/s500.conf
@@ -0,0 +1,12 @@
+
+BOOTLOADER='https://github.com/LeMaker/u-boot-actions'
+BOOTBRANCH='s500-master'
+BOOTSOURCE='u-boot-s500'
+
+LINUXKERNEL='https://github.com/LeMaker/linux-actions'
+KERNELBRANCH='linux-3.10.y'
+LINUXSOURCE='linux-s500'
+
+CPUMIN=408000
+CPUMAX=1104000
+GOVERNOR=interactive
diff --git a/config/sources/sun4i.conf b/config/sources/sun4i.conf
new file mode 100644
index 0000000000..aa4a49ba4e
--- /dev/null
+++ b/config/sources/sun4i.conf
@@ -0,0 +1,39 @@
+
+BOOTLOADER=$MAINLINE_UBOOT
+BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/linux-sunxi/linux-sunxi'
+	KERNELBRANCH='sunxi-3.4'
+	LINUXSOURCE='linux-sunxi'
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=interactive
+	;;
+
+	next)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=ondemand
+	;;
+
+	dev)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=''
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=''
+
+	GOVERNOR=ondemand
+	;;
+
+esac
+
+CPUMIN=480000
+CPUMAX=1010000
diff --git a/config/sources/sun5i.conf b/config/sources/sun5i.conf
new file mode 100644
index 0000000000..aa4a49ba4e
--- /dev/null
+++ b/config/sources/sun5i.conf
@@ -0,0 +1,39 @@
+
+BOOTLOADER=$MAINLINE_UBOOT
+BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/linux-sunxi/linux-sunxi'
+	KERNELBRANCH='sunxi-3.4'
+	LINUXSOURCE='linux-sunxi'
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=interactive
+	;;
+
+	next)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=ondemand
+	;;
+
+	dev)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=''
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=''
+
+	GOVERNOR=ondemand
+	;;
+
+esac
+
+CPUMIN=480000
+CPUMAX=1010000
diff --git a/config/sources/sun6i.conf b/config/sources/sun6i.conf
new file mode 100644
index 0000000000..aa4a49ba4e
--- /dev/null
+++ b/config/sources/sun6i.conf
@@ -0,0 +1,39 @@
+
+BOOTLOADER=$MAINLINE_UBOOT
+BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/linux-sunxi/linux-sunxi'
+	KERNELBRANCH='sunxi-3.4'
+	LINUXSOURCE='linux-sunxi'
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=interactive
+	;;
+
+	next)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=ondemand
+	;;
+
+	dev)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=''
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=''
+
+	GOVERNOR=ondemand
+	;;
+
+esac
+
+CPUMIN=480000
+CPUMAX=1010000
diff --git a/config/sources/sun7i.conf b/config/sources/sun7i.conf
new file mode 100644
index 0000000000..0f45a306c6
--- /dev/null
+++ b/config/sources/sun7i.conf
@@ -0,0 +1,41 @@
+
+BOOTLOADER=$MAINLINE_UBOOT
+BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/linux-sunxi/linux-sunxi'
+	KERNELBRANCH='sunxi-3.4'
+	LINUXSOURCE='linux-sunxi'
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	CPUMAX=1010000
+	GOVERNOR=interactive
+	;;
+
+	next)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	CPUMAX=960000
+	GOVERNOR=ondemand
+	;;
+
+	dev)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=''
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=''
+
+	CPUMAX=960000
+	GOVERNOR=ondemand
+	;;
+
+esac
+
+CPUMIN=480000
diff --git a/config/sources/sun8i.conf b/config/sources/sun8i.conf
new file mode 100644
index 0000000000..10f99016c8
--- /dev/null
+++ b/config/sources/sun8i.conf
@@ -0,0 +1,29 @@
+
+BOOTLOADER=$MAINLINE_UBOOT
+BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/igorpecovnik/linux'
+	KERNELBRANCH='sun8i'
+	LINUXSOURCE='linux-sun8i'
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=interactive
+	;;
+
+	dev)
+	LINUXKERNEL='https://github.com/wens/linux'
+	KERNELBRANCH='h3-emac'
+	LINUXSOURCE='linux-sun8i-mainline'
+
+	BOOTBRANCH=''
+
+	GOVERNOR=ondemand
+	;;
+
+esac
+
+[[ -z $CPUMIN ]] && CPUMIN=480000
+[[ -z $CPUMAX ]] && CPUMAX=1010000
diff --git a/config/sources/sun9i.conf b/config/sources/sun9i.conf
new file mode 100644
index 0000000000..bf01784322
--- /dev/null
+++ b/config/sources/sun9i.conf
@@ -0,0 +1,39 @@
+
+BOOTLOADER=$MAINLINE_UBOOT
+BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/linux-sunxi/linux-sunxi'
+	KERNELBRANCH='sunxi-3.4'
+	LINUXSOURCE='linux-sunxi'
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=interactive
+	;;
+
+	next)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
+
+	GOVERNOR=ondemand
+	;;
+
+	dev)
+	LINUXKERNEL=$MAINLINE_KERNEL
+	KERNELBRANCH=''
+	LINUXSOURCE=$MAINLINE_KERNEL_SOURCE
+
+	BOOTBRANCH=''
+
+	GOVERNOR=ondemand
+	;;
+
+esac
+
+CPUMIN=1200000
+CPUMAX=1800000
diff --git a/config/sources/toradex.conf b/config/sources/toradex.conf
new file mode 100644
index 0000000000..65268e5b68
--- /dev/null
+++ b/config/sources/toradex.conf
@@ -0,0 +1,12 @@
+
+BOOTLOADER='git://git.toradex.com/u-boot-toradex.git'
+BOOTBRANCH='2015.04-toradex'
+BOOTSOURCE='u-boot-toradex'
+
+LINUXKERNEL='git://git.toradex.com/linux-toradex.git'
+KERNELBRANCH='toradex_imx_3.14.28_1.0.0_ga'
+LINUXSOURCE='linux-toradex'
+
+# CPUMIN=
+# CPUMAX=
+GOVERNOR=ondemand
diff --git a/config/sources/udoo.conf b/config/sources/udoo.conf
new file mode 100644
index 0000000000..6903ea9755
--- /dev/null
+++ b/config/sources/udoo.conf
@@ -0,0 +1,22 @@
+
+BOOTLOADER='https://github.com/UDOOboard/uboot-imx'
+BOOTBRANCH='2015.10.fslc-qdl'
+BOOTSOURCE='u-boot-udoo'
+
+case $BRANCH in
+	default)
+	LINUXKERNEL='https://github.com/UDOOboard/linux_kernel'
+	KERNELBRANCH='3.14-1.0.x-udoo'
+	LINUXSOURCE='linux-udoo'
+	;;
+
+	next)
+	LINUXKERNEL='https://github.com/patrykk/linux-udoo'
+	KERNELBRANCH='v4.4.0-6-vivante-5.0.11.p7.3'
+	LINUXSOURCE='linux-udoo-next'
+	;;
+esac
+
+CPUMIN=392000
+CPUMAX=996000
+GOVERNOR=interactive
diff --git a/configuration.sh b/configuration.sh
index 8714af5d9a..eaf6c69214 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -26,166 +26,32 @@ MISC5_DIR="sunxi-display-changer" # local directory
 HOST="$BOARD" # set hostname to the board
 CACHEDIR=$DEST/cache
 
-# board family configurations
+# used by multiple sources - reduce code duplication
+if [[ $USE_MAINLINE_GOOGLE_MIRROR == yes ]]; then
+	MAINLINE_KERNEL='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
+else
+	MAINLINE_KERNEL='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
+fi
+MAINLINE_KERNEL_BRANCH="v$(wget -qO-  https://www.kernel.org/finger_banner | grep "The latest st" | awk '{print $NF}' | head -1)"
+MAINLINE_KERNEL_SOURCE="linux-vanilla"
+
+MAINLINE_UBOOT='git://git.denx.de/u-boot.git'
+MAINLINE_UBOOT_BRANCH="v$(git ls-remote git://git.denx.de/u-boot.git | grep -v rc | grep -v '\^' | tail -1 | cut -d'v' -f 2)"
+MAINLINE_UBOOT_SOURCE='u-boot'
+
+if [[ -f $SRC/lib/config/sources/$LINUXFAMILY.conf ]]; then
+	source $SRC/lib/config/sources/$LINUXFAMILY.conf
+else
+	exit_with_error "Sources configuration not found" "$LINUXFAMILY"
+fi
+
+# temporary overrides
 case $LINUXFAMILY in
-
 	sun4i|sun5i|sun6i|sun7i|sun9i)
-		[[ -z $LINUXCONFIG && $BRANCH == "default" ]] && LINUXCONFIG="linux-"$LINUXFAMILY-"$BRANCH"
-		[[ -z $LINUXCONFIG && $BRANCH != "default" ]] && LINUXCONFIG="linux-sunxi-"$BRANCH
-		# Kernel
-		KERNEL_DEFAULT='https://github.com/linux-sunxi/linux-sunxi'
-		KERNEL_DEFAULT_BRANCH="sunxi-3.4"
-		KERNEL_DEFAULT_SOURCE="linux-sunxi"
-		KERNEL_DEV='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-		[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_DEV='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
-		KERNEL_DEV_BRANCH=""
-		KERNEL_DEV_SOURCE="linux-vanilla"
-		KERNEL_NEXT='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-		[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_NEXT='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
-		KERNEL_NEXT_BRANCH="v"`wget -qO-  https://www.kernel.org/finger_banner | grep "The latest st" | awk '{print $NF}' | head -1`
-		KERNEL_NEXT_SOURCE="linux-vanilla"
-		# U-boot
-		BOOTLOADER="git://git.denx.de/u-boot.git"
-		BOOTSOURCE="u-boot"
-		# latest stable v2016.03 broken gmac on sun7i, fixing it for DEFAULT and NEXT
-		#UBOOT_DEFAULT_BRANCH="v"$(git ls-remote git://git.denx.de/u-boot.git | grep -v rc | grep -v "\^" | tail -1 | cut -d "v" -f 2)		
-		UBOOT_DEFAULT_BRANCH="v2016.01"
-		if [[ $BOARD == lime* || $BOARD == micro ]]; then UBOOT_DEFAULT_BRANCH="v2016.05-rc1"; fi 
-		UBOOT_NEXT_BRANCH=$UBOOT_DEFAULT_BRANCH
-		UBOOT_DEV_BRANCH=""
-	;;
-
-	sun8i)
-		[[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-"$LINUXFAMILY-"$BRANCH"
-		#KERNEL_DEFAULT="https://github.com/O-Computers/linux-sunxi"
-		#KERNEL_DEFAULT_BRANCH="h3-wip"
-		#KERNEL_DEFAULT_SOURCE="linux-sun8i"
-		KERNEL_DEFAULT="https://github.com/igorpecovnik/linux"
-		KERNEL_DEFAULT_BRANCH="sun8i"
-		KERNEL_DEFAULT_SOURCE="linux-sun8i"
-		KERNEL_DEV="https://github.com/wens/linux"
-		KERNEL_DEV_BRANCH=h3-emac
-		KERNEL_DEV_SOURCE="linux-sun8i-mainline"
-		BOOTLOADER="git://git.denx.de/u-boot.git"
-		BOOTSOURCE="u-boot"
-		UBOOT_DEFAULT_BRANCH="v"$(git ls-remote git://git.denx.de/u-boot.git | grep -v rc | grep -v "\^" | tail -1 | cut -d "v" -f 2)
-		UBOOT_DEV_BRANCH=""
-	;;
-
-	odroidxu4)
-		KERNEL_DEFAULT='https://github.com/hardkernel/linux'
-		KERNEL_DEFAULT_BRANCH="odroidxu3-3.10.y"
-		KERNEL_DEFAULT_SOURCE="linux-odroidxu4"
-		KERNEL_NEXT='https://github.com/tobetter/linux'
-		KERNEL_NEXT_BRANCH="odroidxu4-v4.2"
-		KERNEL_NEXT_SOURCE="linux-odroidxu-next"
-		BOOTLOADER="https://github.com/hardkernel/u-boot.git"
-		BOOTBRANCH="odroidxu3-v2012.07"
-		BOOTSOURCE="u-boot-odroidxu"
-	;;
-
-	odroidc1)
-		KERNEL_DEFAULT='https://github.com/hardkernel/linux'
-		KERNEL_DEFAULT_BRANCH="odroidc-3.10.y"
-		KERNEL_DEFAULT_SOURCE="linux-odroidc1"
-		KERNEL_NEXT='https://github.com/tobetter/linux'
-		KERNEL_NEXT_BRANCH="odroidxu4-v4.2"
-		KERNEL_NEXT_SOURCE="linux-odroidxu-next"
-		BOOTLOADER="https://github.com/hardkernel/u-boot.git"
-		BOOTBRANCH="odroidc-v2011.03"
-		BOOTSOURCE="u-boot-odroidc1"
-		UBOOT_NEEDS_GCC="< 5.0"
-	;;
-	
-	odroidc2)
-		KERNEL_DEFAULT='https://github.com/hardkernel/linux'
-		KERNEL_DEFAULT_BRANCH="odroidc2-3.14.y"
-		KERNEL_DEFAULT_SOURCE="linux-odroidc2"
-		BOOTLOADER="https://github.com/hardkernel/u-boot.git"
-		BOOTBRANCH="odroidc2-v2015.01"
-		BOOTSOURCE="u-boot-odroidc2"
-	;;
-	
-	udoo)
-		KERNEL_DEFAULT="https://github.com/UDOOboard/linux_kernel"
-		KERNEL_DEFAULT_BRANCH="3.14-1.0.x-udoo"
-		KERNEL_DEFAULT_SOURCE="linux-udoo"
-		KERNEL_NEXT="https://github.com/patrykk/linux-udoo"
-		KERNEL_NEXT_BRANCH="v4.4.0-6-vivante-5.0.11.p7.3"
-		KERNEL_NEXT_SOURCE="linux-udoo-next"
-		BOOTLOADER="https://github.com/UDOOboard/uboot-imx"
-		BOOTBRANCH="2015.10.fslc-qdl"
-		BOOTSOURCE="u-boot-udoo"
-	;;
-
-	neo)
-		KERNEL_DEFAULT='https://github.com/UDOOboard/linux_kernel'
-		#KERNEL_DEFAULT_BRANCH="imx_3.14.28_1.0.0_ga_neo"
-		KERNEL_DEFAULT_BRANCH="3.14-1.0.x-udoo"
-		#KERNEL_DEFAULT_SOURCE="linux-udoo-neo"
-		KERNEL_DEFAULT_SOURCE="linux-udoo"
-		BOOTLOADER="https://github.com/UDOOboard/uboot-imx"
-		BOOTBRANCH="2015.04.imx-neo"
-		BOOTSOURCE="u-boot-neo"
-	;;
-
-	cubox)
-		KERNEL_DEFAULT='https://github.com/linux4kix/linux-linaro-stable-mx6'
-		KERNEL_DEFAULT_BRANCH="linux-linaro-lsk-v3.14-mx6"
-		KERNEL_DEFAULT_SOURCE="linux-cubox"
-		KERNEL_NEXT='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-		[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_NEXT='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
-		KERNEL_NEXT_BRANCH="v"`wget -qO-  https://www.kernel.org/finger_banner | grep "The latest st" | awk '{print $NF}' | head -1`
-		KERNEL_NEXT_SOURCE="linux-vanilla"
-		KERNEL_DEV='https://github.com/SolidRun/linux-fslc'
-		KERNEL_DEV_BRANCH="3.14-1.0.x-mx6-sr"
-		KERNEL_DEV_SOURCE="linux-cubox"
-		BOOTLOADER="https://github.com/SolidRun/u-boot-imx6"
-		BOOTBRANCH="imx6"
-		BOOTSOURCE="u-boot-cubox"
-	;;
-
-	s500)
-		KERNEL_DEFAULT='https://github.com/LeMaker/linux-actions'
-		KERNEL_DEFAULT_BRANCH="linux-3.10.y"
-		KERNEL_DEFAULT_SOURCE="linux-s500"
-		BOOTLOADER="https://github.com/LeMaker/u-boot-actions"
-		BOOTBRANCH="s500-master"
-		BOOTSOURCE="u-boot-s500"
-	;;
-
-	toradex)
-		KERNEL_DEFAULT="git://git.toradex.com/linux-toradex.git"
-		KERNEL_DEFAULT_BRANCH="toradex_imx_3.14.28_1.0.0_ga"
-		KERNEL_DEFAULT_SOURCE="linux-toradex"
-		BOOTLOADER="git://git.toradex.com/u-boot-toradex.git"
-		BOOTBRANCH="2015.04-toradex"
-		BOOTSOURCE="u-boot-toradex"
-	;;
-
-	marvell)
-		KERNEL_DEFAULT="https://github.com/SolidRun/linux-armada38x"
-		KERNEL_DEFAULT_BRANCH="linux-3.10.70-15t1-clearfog"
-		KERNEL_DEFAULT_SOURCE="linux-armada"
-		KERNEL_NEXT='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-		[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_NEXT='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
-		KERNEL_NEXT_BRANCH="v"`wget -qO-  https://www.kernel.org/finger_banner | grep "The latest st" | awk '{print $NF}' | head -1`
-		KERNEL_NEXT_SOURCE="linux-vanilla"
-		KERNEL_DEV='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-		[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_DEV='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
-		KERNEL_DEV_BRANCH=""
-		KERNEL_DEV_SOURCE="linux-vanilla"
-		BOOTLOADER="https://github.com/SolidRun/u-boot-armada38x"
-		BOOTBRANCH="u-boot-2013.01-15t1-clearfog"
-		BOOTSOURCE="u-boot-armada"
-	;;
-
-	*)
-		if [[ -f $SRC/lib/config/sources/$LINUXFAMILY.family ]]; then
-			source $SRC/lib/config/sources/$LINUXFAMILY.family
-		else
-			exit_with_error "Sources configuration not found" "$LINUXFAMILY"
-		fi
+		# latest stable u-boot v2016.03 broke gmac on sun7i, fixing it for DEFAULT and NEXT
+		[[ $BRANCH == default || $BRANCH == next ]] && BOOTBRANCH='v2016.01'
+		# fix for olimex boards
+		[[ ($BRANCH == default || $BRANCH == next) && ($BOARD == lime* || $BOARD == micro) ]] && BOOTBRANCH='v2016.05-rc1'
 	;;
 esac
 
@@ -197,22 +63,8 @@ esac
 [[ -z $SERIALCON ]] && SERIALCON=ttyS0
 [[ -z $BOOTSIZE ]] && BOOTSIZE=0 # Mb size of boot partition
 
-[[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-$LINUXFAMILY-$BRANCH"
-[[ -z $LINUXKERNEL ]] && eval LINUXKERNEL=\$KERNEL_${BRANCH^^}
-[[ -z $LINUXSOURCE ]] && eval LINUXSOURCE=\$KERNEL_${BRANCH^^}"_SOURCE"
-[[ -z $KERNELBRANCH ]] && eval KERNELBRANCH=\$KERNEL_${BRANCH^^}"_BRANCH"
-[[ -z $BOOTLOADER ]] && eval BOOTLOADER=\$UBOOT_${BRANCH^^}
-[[ -z $BOOTSOURCE ]] && eval BOOTSOURCE=\$UBOOT_${BRANCH^^}"_SOURCE"
-[[ -z $BOOTBRANCH ]] && eval BOOTBRANCH=\$UBOOT_${BRANCH^^}"_BRANCH"
-[[ -z $CPUMIN && $LINUXFAMILY == sun*i ]] && CPUMIN="480000" && CPUMAX="1010000" && GOVERNOR="interactive"
-[[ $BRANCH != "default" && $LINUXFAMILY == sun*i ]] && GOVERNOR="ondemand"
-[[ -z $CPUMIN && $LINUXFAMILY == odroidxu4 ]] && CPUMIN="600000" && CPUMAX="2000000" && GOVERNOR="conservative"
-[[ -z $CPUMIN && $LINUXFAMILY == odroidc1 ]] && CPUMIN="504000" && CPUMAX="1728000" && GOVERNOR="interactive"
-[[ -z $CPUMIN && $LINUXFAMILY == cubox ]] && CPUMIN="396000" && CPUMAX="996000" && GOVERNOR="interactive"
-[[ -z $CPUMIN && $LINUXFAMILY == s500 ]] && CPUMIN="408000" && CPUMAX="1104000" && GOVERNOR="interactive"
-[[ -z $CPUMIN && $LINUXFAMILY == marvell ]] && CPUMIN="800000" && CPUMAX="1600000" && GOVERNOR="ondemand"
-[[ -z $CPUMIN && ($LINUXFAMILY == udoo || $LINUXFAMILY == neo ) ]] && CPUMIN="392000" && CPUMAX="996000" && GOVERNOR="interactive"
-[[ -z $GOVERNOR ]] && GOVERNOR="ondemand"
+[[ $LINUXFAMILY == sun*i && $BRANCH != default && $LINUXFAMILY != sun8i ]] && LINUXCONFIG="linux-sunxi-${BRANCH}"
+[[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 
 # naming to distro
 if [[ $RELEASE == trusty || $RELEASE == xenial ]]; then DISTRIBUTION="Ubuntu"; else DISTRIBUTION="Debian"; fi
@@ -238,7 +90,7 @@ PACKAGE_LIST="automake bash-completion bc bridge-utils build-essential cmake cpu
 	device-tree-compiler dosfstools figlet fbset fping git haveged hdparm hostapd ifenslave-2.6 \
 	iw libtool libwrap0-dev libssl-dev lirc lsof fake-hwclock wpasupplicant libusb-dev psmisc \
 	ntp parted pkg-config pv rfkill rsync sudo curl dialog crda wireless-regdb ncurses-term \
-	sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools \
+	sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools libnl-3-dev \
 	console-setup console-data console-common unicode-data openssh-server libmtp-runtime initramfs-tools ca-certificates"
 
 # Non-essential packages
@@ -246,25 +98,37 @@ PACKAGE_LIST_ADDITIONAL="alsa-utils btrfs-tools bluez hddtemp i2c-tools iperf ir
 	dvb-apps sysbench libbluetooth-dev libbluetooth3 subversion screen ntfs-3g vim pciutils evtest htop mtp-tools python-smbus \
 	apt-transport-https libfuse2 libdigest-sha-perl libproc-processtable-perl w-scan aptitude dnsutils f3"
 
+PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-core xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage radiotray wicd thunar-volman galculator \
+gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl gksu wifi-radar"
+# hardware acceleration support packages
+if [[ $LINUXCONFIG == *sun* && $BRANCH == default ]]; then
+	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP xorg-dev xutils-dev x11proto-dri2-dev xutils-dev libdrm-dev libvdpau-dev"
+fi
+
 # Release specific packages
 case $RELEASE in
 	wheezy)
-	PACKAGE_LIST_RELEASE="less makedev kbd libnl-3-dev acpid acpi-support-base libnl-genl-3-dev"
+	PACKAGE_LIST_RELEASE="less makedev kbd acpid acpi-support-base libnl-genl-3-dev"
+	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel icedove"
 	PACKAGE_LIST_EXCLUDE=""
 	;;
 	jessie)
-	PACKAGE_LIST_RELEASE="less makedev kbd thin-provisioning-tools libnl-3-dev libnl-genl-3-dev libpam-systemd \
+	PACKAGE_LIST_RELEASE="less makedev kbd thin-provisioning-tools libnl-genl-3-dev libpam-systemd \
 		software-properties-common python-software-properties libnss-myhostname f2fs-tools libnl-genl-3-dev"
+	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove gvfs policykit-1 policykit-1-gnome eject"
 	PACKAGE_LIST_EXCLUDE=""
 	;;
 	trusty)	
-	PACKAGE_LIST_RELEASE="man-db wget iptables nano libnl-3-dev libnl-genl-3-dev software-properties-common \
+	PACKAGE_LIST_RELEASE="man-db wget iptables nano libnl-genl-3-dev software-properties-common \
 		python-software-properties f2fs-tools acpid"
+	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP libreoffice-writer libreoffice-java-common thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends"
 	PACKAGE_LIST_EXCLUDE="ureadahead plymouth"
 	;;
 	xenial)
-	PACKAGE_LIST_RELEASE="man-db wget iptables nano thin-provisioning-tools libnl-3-dev libnl-genl-3-dev libpam-systemd \
+	PACKAGE_LIST_RELEASE="man-db wget iptables nano thin-provisioning-tools libnl-genl-3-dev libpam-systemd \
 		software-properties-common python-software-properties libnss-myhostname f2fs-tools"
+	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP libreoffice-writer thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends \
+			policykit-1 xserver-xorg-video-fbdev"
 	PACKAGE_LIST_EXCLUDE=""
 	;;
 esac
@@ -272,43 +136,15 @@ esac
 # Remove ARM64 missing packages. Temporally
 PACKAGE_LIST_RELEASE=${PACKAGE_LIST_RELEASE//thin-provisioning-tools }
 
-# additional desktop packages
-if [[ $BUILD_DESKTOP == yes ]]; then
-	# common packages
-	PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-core xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage radiotray wicd thunar-volman galculator \
-	gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl gksu wifi-radar"
-	# release specific desktop packages
-	case $RELEASE in
-		wheezy)
-		PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel icedove"
-		;;
-		jessie)
-		PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove gvfs policykit-1 policykit-1-gnome eject"
-		;;
-		trusty)
-		PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP libreoffice-writer libreoffice-java-common thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends"
-		;;
-		xenial)
-		PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP libreoffice-writer thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends \
-			policykit-1 xserver-xorg-video-fbdev"
-		;;
-	esac
-	# hardware acceleration support packages
-	if [[ $LINUXCONFIG == *sun* && $BRANCH == default ]]; then
-		PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP xorg-dev xutils-dev x11proto-dri2-dev xutils-dev libdrm-dev libvdpau-dev"
-	fi
-else
-	PACKAGE_LIST_DESKTOP=""
-fi
-
 # For user override
-if [[ -f "$SRC/userpatches/lib.config" ]]; then
+if [[ -f $SRC/userpatches/lib.config ]]; then
 	display_alert "Using user configuration override" "userpatches/lib.config" "info"
 	source $SRC/userpatches/lib.config
 fi
 
 # Build final package list after possible override
-PACKAGE_LIST="$PACKAGE_LIST $PACKAGE_LIST_RELEASE $PACKAGE_LIST_ADDITIONAL $PACKAGE_LIST_DESKTOP"
+PACKAGE_LIST="$PACKAGE_LIST $PACKAGE_LIST_RELEASE $PACKAGE_LIST_ADDITIONAL"
+[[ $BUILD_DESKTOP == yes ]] && PACKAGE_LIST="$PACKAGE_LIST $PACKAGE_LIST_DESKTOP"
 
 # debug
 echo -e "Config: $LINUXCONFIG\nKernel source: $LINUXKERNEL\nBranch: $KERNELBRANCH" >> $DEST/debug/install.log