Clean up BOOTPATCHDIR logic, set default value

config/sources/cubox.conf

@@ -1,7 +1,6 @@
 BOOTSOURCE='https://github.com/SolidRun/u-boot-imx6'
 BOOTBRANCH='branch:imx6'
 BOOTDIR='u-boot-cubox'
-BOOTPATCHDIR='u-boot-cubox'
 BOOTSCRIPT='boot-cubox.cmd:boot.cmd'
 BOOTENV_FILE='cubox-default.txt'
 

config/sources/mvebu.conf

@@ -1,7 +1,6 @@
 BOOTSOURCE='https://github.com/SolidRun/u-boot-armada38x'
 BOOTBRANCH='branch:u-boot-2013.01-15t1-clearfog'
 BOOTDIR='u-boot-armada'
-BOOTPATCHDIR='u-boot-armada'
 BOOTSCRIPT='boot-marvell.cmd:boot.cmd'
 
 UBOOT_TARGET_MAP="u-boot.mmc;;u-boot.mmc u-boot-uart.mmc

config/sources/odroidc1.conf

@@ -1,7 +1,6 @@
 BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
 BOOTBRANCH='branch:odroidc-v2011.03'
 BOOTDIR='u-boot-odroidc1'
-BOOTPATCHDIR='u-boot-odroidc1'
 UBOOT_USE_GCC='< 4.9'
 BOOTSCRIPT="boot-odroid-c1.ini:boot.ini"
 

config/sources/odroidc2.conf

@@ -1,7 +1,6 @@
 BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
 BOOTBRANCH='branch:odroidc2-v2015.01'
 BOOTDIR='u-boot-odroidc2'
-BOOTPATCHDIR='u-boot-odroidc2'
 UBOOT_USE_GCC='< 5.0'
 BOOTSCRIPT="boot-odroid-c2.ini:boot.ini"
 

config/sources/rda8810.conf

@@ -1,7 +1,6 @@
 BOOTSOURCE='https://github.com/zador-blood-stained/u-boot-orangepi2g'
 BOOTBRANCH='branch:master'
 BOOTDIR='u-boot-rda8810'
-BOOTPATCHDIR='u-boot-rda8810'
 BOOTSCRIPT='boot-rda8810.cmd:boot.cmd'
 BOOTENV_FILE='rda8810-default.txt'
 

config/sources/s500.conf

@@ -14,7 +14,6 @@ case $BOARD in
 	BOOTSOURCE='https://github.com/LeMaker/u-boot-actions'
 	BOOTBRANCH='branch:s500-master'
 	BOOTDIR='u-boot-s500'
-	BOOTPATCHDIR='u-boot-s500'
 	UBOOT_TARGET_MAP="u-boot-dtb.img;;$SRC/lib/bin/s500-bootloader-guitar.bin u-boot-dtb.img"
 	SERIALCON=ttyS3
 	;;

config/sources/sunxi_common.inc

@@ -3,7 +3,7 @@ BOOTDIR=$MAINLINE_UBOOT_DIR
 BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
 BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
 BOOTENV_FILE='sunxi-default.txt'
-BOOTPATCHDIR="u-boot-sunxi"
+BOOTPATCHDIR='u-boot-sunxi'
 
 UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin'
 
@@ -13,6 +13,10 @@ UBOOT_FW_ENV='0x88000,0x20000' # /etc/fw_env.config offset and env size
 HAS_UUID_SUPPORT=yes
 BOOTDELAY=0
 
+# Here we want to rename LINUXFAMILY from sun4i, sun5i, etc for next and dev branches
+# except for sun8i-dev which is separate from sunxi-dev
+[[ $BRANCH != default && ! ( $LINUXFAMILY == sun8i && $BRANCH == dev ) ]] && LINUXFAMILY=sunxi
+
 case $BRANCH in
 	default)
 	GOVERNOR=interactive

config/sources/udoo.conf

@@ -1,6 +1,5 @@
 BOOTSOURCE='https://github.com/UDOOboard/uboot-imx'
 BOOTDIR='u-boot-udoo'
-BOOTPATCHDIR='u-boot-udoo'
 BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"
 
 UBOOT_TARGET_MAP=';;SPL u-boot.img'

configuration.sh

@@ -93,13 +93,10 @@ case $ARCH in
 	;;
 esac
 
-# Here we want to use linux-sunxi-next and linux-sunxi-dev configs for sun*i
-# except for sun8i-dev which is separate from sunxi-dev
-[[ $LINUXFAMILY == sun*i && $BRANCH != default && ! ( $LINUXFAMILY == sun8i && $BRANCH == dev ) ]] && \
-	LINUXCONFIG="linux-sunxi-${BRANCH}"
-
 [[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 
+[[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-$LINUXFAMILY"
+
 if [[ $RELEASE == xenial ]]; then DISTRIBUTION="Ubuntu"; else DISTRIBUTION="Debian"; fi
 
 # Essential packages

main.sh

@@ -213,12 +213,6 @@ fi
 
 compile_sunxi_tools
 
-# Here we want to rename LINUXFAMILY from sun4i, sun5i, etc for next and dev branches
-# except for sun8i-dev which is separate from sunxi-dev
-if [[ $LINUXFAMILY == sun*i && $BRANCH != default ]]; then
-    [[ ! ( $LINUXFAMILY == sun8i && $BRANCH == dev ) ]] && LINUXFAMILY="sunxi"
-fi
-
 # define package names
 DEB_BRANCH=${BRANCH//default}
 # if not empty, append hyphen