diff --git a/configuration.sh b/configuration.sh
index bae2fb05e7..3c1c6f6c3d 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -200,9 +200,12 @@
 
 		orangepiplus)#enabled
 			#description H3 quad core 1Gb SoC Wifi USB hub
-			#build 2wip
+			#build 4wip
 			LINUXFAMILY="sun8i"		
 			BOOTCONFIG="orangepi_plus_defconfig"
+			LINUXKERNEL="https://github.com/jwrdegoede/linux-sunxi"
+			LINUXSOURCE="hans"
+			KERNELBRANCH="sunxi-wip"
 		;;
 
 		cubox-i)#enabled
@@ -247,8 +250,7 @@
 		odroid)#enabled
 			#description Exynos5422 XU3/XU4 octa core
 			#build 3wip	
-			LINUXFAMILY="odroid"	
-			OFFSET="16" 
+			LINUXFAMILY="odroid"				
 			BOOTSIZE="16"
 			BOOTCONFIG="odroid_config"		
 			MODULES="ethernet wlan_8723bs bonding"
@@ -265,7 +267,7 @@
 	# board family configurations
 	case $LINUXFAMILY in
 	
-		sun4i|sun7i|sun6i|sun9i)
+		sun4i|sun7i|sun8i|sun6i|sun9i)
 			[[ -z $LINUXCONFIG && $BRANCH == "default" ]] && LINUXCONFIG="linux-"$LINUXFAMILY-"$BRANCH"
 			[[ -z $LINUXCONFIG && $BRANCH != "default" ]] && LINUXCONFIG="linux-sunxi-"$BRANCH
 			# Kernel
@@ -279,9 +281,15 @@
 			KERNEL_DEV_BRANCH=""
 			KERNEL_DEV_SOURCE="linux-vanilla"
 			# U-boot
-			UBOOT="git://git.denx.de/u-boot.git"
-			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)
-			UBOOT_SOURCE="u-boot"
+			UBOOT_DEFAULT="git://git.denx.de/u-boot.git"
+			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_SOURCE="u-boot"
+			UBOOT_NEXT=$UBOOT_DEFAULT
+			UBOOT_NEXT_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_NEXT_SOURCE=$UBOOT_DEFAULT_SOURCE
+			UBOOT_DEV=$UBOOT_DEFAULT
+			UBOOT_DEV_BRANCH=""
+			UBOOT_DEV_SOURCE=$UBOOT_DEFAULT_SOURCE
 		;;
 	
 		odroid)
@@ -291,9 +299,15 @@
 			KERNEL_NEXT='https://github.com/tobetter/linux'
 			KERNEL_NEXT_BRANCH="odroidxu4-v4.2"
 			KERNEL_NEXT_SOURCE="linux-odroid-next"		
-			UBOOT="https://github.com/hardkernel/u-boot.git"
-			UBOOT_BRANCH="odroidxu3-v2012.07"
-			UBOOT_SOURCE="u-boot-odroid"
+			UBOOT_DEFAULT="https://github.com/hardkernel/u-boot.git"
+			UBOOT_DEFAULT_BRANCH="odroidxu3-v2012.07"
+			UBOOT_DEFAULT_SOURCE="u-boot-odroid"
+			UBOOT_NEXT=$UBOOT_DEFAULT
+			UBOOT_NEXT_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_NEXT_SOURCE=$UBOOT_DEFAULT_SOURCE
+			UBOOT_DEV=$UBOOT_DEFAULT
+			UBOOT_DEV_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_DEV_SOURCE=$UBOOT_DEFAULT_SOURCE
 		;;
 		
 		udoo)
@@ -303,36 +317,60 @@
 			KERNEL_NEXT="https://github.com/patrykk/linux-udoo"
 			KERNEL_NEXT_BRANCH="4.2-5.0.11.p7.1"
 			KERNEL_NEXT_SOURCE="linux-udoo-next"		
-			UBOOT="https://github.com/UDOOboard/uboot-imx"
-			UBOOT_BRANCH="master"
-			UBOOT_SOURCE="u-boot-neo"
+			UBOOT_DEFAULT="https://github.com/UDOOboard/uboot-imx"
+			UBOOT_DEFAULT_BRANCH="master"
+			UBOOT_DEFAULT_SOURCE="u-boot-neo"
+			UBOOT_NEXT=$UBOOT_DEFAULT
+			UBOOT_NEXT_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_NEXT_SOURCE=$UBOOT_DEFAULT_SOURCE
+			UBOOT_DEV=$UBOOT_DEFAULT
+			UBOOT_DEV_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_DEV_SOURCE=$UBOOT_DEFAULT_SOURCE
 		;;
 		
 		neo)
 			KERNEL_DEFAULT='https://github.com/UDOOboard/linux_kernel'
 			KERNEL_DEFAULT_BRANCH="imx_3.14.28_1.0.0_ga_neo_dev"
 			KERNEL_DEFAULT_SOURCE="linux-udoo-neo"		
-			UBOOT="https://github.com/UDOOboard/uboot-imx"
-			UBOOT_BRANCH="master"
-			UBOOT_SOURCE="u-boot-neo"
+			UBOOT_DEFAULT="https://github.com/UDOOboard/uboot-imx"
+			UBOOT_DEFAULT_BRANCH="master"
+			UBOOT_DEFAULT_SOURCE="u-boot-neo"
+			UBOOT_NEXT=$UBOOT_DEFAULT
+			UBOOT_NEXT_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_NEXT_SOURCE=$UBOOT_DEFAULT_SOURCE
+			UBOOT_DEV=$UBOOT_DEFAULT
+			UBOOT_DEV_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_DEV_SOURCE=$UBOOT_DEFAULT_SOURCE
 		;;
 		
 		cubox)
 			KERNEL_DEFAULT='https://github.com/linux4kix/linux-linaro-stable-mx6'
 			KERNEL_DEFAULT_BRANCH="imx_3.14.28_1.0.0_ga_neo_dev"
 			KERNEL_DEFAULT_SOURCE="linux-linaro-lsk-v3.14-mx6"		
-			UBOOT="https://github.com/SolidRun/u-boot-imx6"
-			UBOOT_BRANCH="imx6"
-			UBOOT_SOURCE="u-boot-cubox"
+			UBOOT_DEFAULT="https://github.com/SolidRun/u-boot-imx6"
+			UBOOT_DEFAULT_BRANCH="imx6"
+			UBOOT_DEFAULT_SOURCE="u-boot-cubox"
+			UBOOT_NEXT=$UBOOT_DEFAULT
+			UBOOT_NEXT_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_NEXT_SOURCE=$UBOOT_DEFAULT_SOURCE
+			UBOOT_DEV=$UBOOT_DEFAULT
+			UBOOT_DEV_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_DEV_SOURCE=$UBOOT_DEFAULT_SOURCE
 		;;
 		
 		s500)
 			KERNEL_DEFAULT='https://github.com/LeMaker/linux-actions'
 			KERNEL_DEFAULT_BRANCH="s500-master"
 			KERNEL_DEFAULT_SOURCE="linux-s500"
-			UBOOT="https://github.com/LeMaker/u-boot-actions"
-			UBOOT_BRANCH="s500-master"
-			UBOOT_SOURCE="u-boot-s500"
+			UBOOT_DEFAULT="https://github.com/LeMaker/u-boot-actions"
+			UBOOT_DEFAULT_BRANCH="s500-master"
+			UBOOT_DEFAULT_SOURCE="u-boot-s500"
+			UBOOT_NEXT=$UBOOT_DEFAULT
+			UBOOT_NEXT_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_NEXT_SOURCE=$UBOOT_DEFAULT_SOURCE
+			UBOOT_DEV=$UBOOT_DEFAULT
+			UBOOT_DEV_BRANCH=$UBOOT_DEFAULT_BRANCH
+			UBOOT_DEV_SOURCE=$UBOOT_DEFAULT_SOURCE
 		;;	
 		
 		*) echo "Defaults not found"
@@ -346,9 +384,9 @@
 	[[ -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
-	[[ -z $BOOTSOURCE ]] && eval BOOTSOURCE=\$UBOOT_SOURCE
-	[[ -z $BOOTBRANCH ]] && eval BOOTBRANCH=\$UBOOT_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"
 	[[ -z $CPUMIN && $LINUXFAMILY == odroid ]] && CPUMIN="600000" && CPUMAX="1800000" && GOVERNOR="conservative"
 	[[ -z $CPUMIN && $LINUXFAMILY == cubox ]] && CPUMIN="396000" && CPUMAX="996000" && GOVERNOR="interactive"
diff --git a/patch/u-boot/u-boot/add-awsom-uboot.patch b/patch/u-boot/u-boot-dev/add-awsom-uboot.patch
similarity index 100%
rename from patch/u-boot/u-boot/add-awsom-uboot.patch
rename to patch/u-boot/u-boot-dev/add-awsom-uboot.patch
diff --git a/patch/u-boot/u-boot/add-cubieboard4.patch b/patch/u-boot/u-boot-dev/add-cubieboard4.patch
similarity index 100%
rename from patch/u-boot/u-boot/add-cubieboard4.patch
rename to patch/u-boot/u-boot-dev/add-cubieboard4.patch
diff --git a/patch/u-boot/u-boot/add-lamobo-r1-uboot.patch b/patch/u-boot/u-boot-dev/add-lamobo-r1-uboot.patch
similarity index 100%
rename from patch/u-boot/u-boot/add-lamobo-r1-uboot.patch
rename to patch/u-boot/u-boot-dev/add-lamobo-r1-uboot.patch
diff --git a/patch/u-boot/u-boot-neo/udoo_and_neo_ext2_boot.scr.patch b/patch/u-boot/u-boot-neo-default/udoo_and_neo_ext2_boot.scr.patch
similarity index 100%
rename from patch/u-boot/u-boot-neo/udoo_and_neo_ext2_boot.scr.patch
rename to patch/u-boot/u-boot-neo-default/udoo_and_neo_ext2_boot.scr.patch
diff --git a/patch/u-boot/u-boot-next/add-awsom-uboot.patch b/patch/u-boot/u-boot-next/add-awsom-uboot.patch
new file mode 100644
index 0000000000..32ab6f159a
--- /dev/null
+++ b/patch/u-boot/u-boot-next/add-awsom-uboot.patch
@@ -0,0 +1,23 @@
+===================================================================
+--- /dev/null
++++ u-boot-2015.01/configs/Awsom_defconfig
+@@ -0,0 +1,19 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_MACH_SUN7I=y
++CONFIG_DRAM_CLK=480
++CONFIG_DRAM_ZQ=127
++CONFIG_DRAM_EMR1=4
++CONFIG_MMC0_CD_PIN="PB9"
++CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_SPL=y
++CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
++# CONFIG_CMD_IMLS is not set
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++CONFIG_DM_ETH=y
++CONFIG_ETH_DESIGNWARE=y
++CONFIG_DM_SERIAL=y
++CONFIG_USB=y
++CONFIG_DM_USB=y
diff --git a/patch/u-boot/u-boot-next/add-cubieboard4.patch b/patch/u-boot/u-boot-next/add-cubieboard4.patch
new file mode 100644
index 0000000000..326415f000
--- /dev/null
+++ b/patch/u-boot/u-boot-next/add-cubieboard4.patch
@@ -0,0 +1,21 @@
+diff --git a/arch/arm/dts/Cubieboard4_defconfig b/arch/arm/dts/Cubieboard4_defconfig
+new file mode 100755
+index 0000000..f400ed2
+--- /dev/null
++++ b/arch/arm/dts/Cubieboard4_defconfig
+@@ -0,0 +1,15 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_MACH_SUN9I=y
++CONFIG_DRAM_CLK=360
++CONFIG_DRAM_ZQ=123
++CONFIG_SYS_CLK_FREQ=1008000000
++CONFIG_MMC0_CD_PIN="PH18"
++# CONFIG_VIDEO is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-cubieboard4"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++# CONFIG_CMD_IMLS is not set
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++CONFIG_CMD_GPIO=y
++CONFIG_SYS_NS16550=y
diff --git a/patch/u-boot/u-boot-next/add-lamobo-r1-uboot.patch b/patch/u-boot/u-boot-next/add-lamobo-r1-uboot.patch
new file mode 100644
index 0000000000..4eb7ddb78d
--- /dev/null
+++ b/patch/u-boot/u-boot-next/add-lamobo-r1-uboot.patch
@@ -0,0 +1,267 @@
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+old mode 100644
+new mode 100755
+index 0a8c88d..2ca592d
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -126,6 +126,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
+ 	sun7i-a20-ainol-aw1.dtb \
+ 	sun7i-a20-bananapi.dtb \
+ 	sun7i-a20-bananapro.dtb \
++	sun7i-a20-lamobo-r1.dtb \
+ 	sun7i-a20-cubieboard2.dtb \
+ 	sun7i-a20-cubietruck.dtb \
+ 	sun7i-a20-hummingbird.dtb \
+diff --git a/arch/arm/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
+new file mode 100755
+index 0000000..4f826f1
+--- /dev/null
++++ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
+@@ -0,0 +1,223 @@
++/*
++ * Copyright 2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * Hans de Goede <hdegoede@redhat.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "sun7i-a20.dtsi"
++#include "sunxi-common-regulators.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/interrupt-controller/irq.h>
++#include <dt-bindings/pinctrl/sun4i-a10.h>
++
++/ {
++	model = "Lamobo R1";
++	compatible = "lemaker,bananapi", "allwinner,sun7i-a20";
++
++	aliases {
++		serial0 = &uart0;
++		serial1 = &uart3;
++		serial2 = &uart7;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pins_bananapi>;
++
++		green {
++			label = "bananapi:green:usr";
++			gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
++		};
++	};
++
++	reg_gmac_3v3: gmac-3v3 {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		pinctrl-0 = <&gmac_power_pin_bananapi>;
++		regulator-name = "gmac-3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		startup-delay-us = <100000>;
++		enable-active-high;
++		gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>;
++	};
++};
++
++&ahci {
++	status = "okay";
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&gmac {
++	pinctrl-names = "default";
++	pinctrl-0 = <&gmac_pins_rgmii_a>;
++	phy = <&phy1>;
++	phy-mode = "rgmii";
++	phy-supply = <&reg_gmac_3v3>;
++	status = "okay";
++
++	phy1: ethernet-phy@1 {
++		reg = <1>;
++	};
++};
++
++&i2c0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c0_pins_a>;
++	status = "okay";
++
++	axp209: pmic@34 {
++		compatible = "x-powers,axp209";
++		reg = <0x34>;
++		interrupt-parent = <&nmi_intc>;
++		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
++
++		interrupt-controller;
++		#interrupt-cells = <1>;
++	};
++};
++
++&i2c2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c2_pins_a>;
++	status = "okay";
++};
++
++&ir0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&ir0_rx_pins_a>;
++	status = "okay";
++};
++
++&mmc0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
++	vmmc-supply = <&reg_vcc3v3>;
++	bus-width = <4>;
++	cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
++	cd-inverted;
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&pio {
++	mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
++		allwinner,pins = "PH10";
++		allwinner,function = "gpio_in";
++		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
++		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
++	};
++
++	gmac_power_pin_bananapi: gmac_power_pin@0 {
++		allwinner,pins = "PH23";
++		allwinner,function = "gpio_out";
++		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
++		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
++	};
++
++	led_pins_bananapi: led_pins@0 {
++		allwinner,pins = "PH24";
++		allwinner,function = "gpio_out";
++		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
++		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
++	};
++};
++
++&reg_usb1_vbus {
++	status = "okay";
++};
++
++&reg_usb2_vbus {
++	status = "okay";
++};
++
++&spi0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&spi0_pins_a>,
++		    <&spi0_cs0_pins_a>,
++		    <&spi0_cs1_pins_a>;
++	status = "okay";
++};
++
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_pins_a>;
++	status = "okay";
++};
++
++&uart3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart3_pins_b>;
++	status = "okay";
++};
++
++&uart7 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart7_pins_a>;
++	status = "okay";
++};
++
++&usbphy {
++	usb1_vbus-supply = <&reg_usb1_vbus>;
++	usb2_vbus-supply = <&reg_usb2_vbus>;
++	status = "okay";
++};
+diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
+new file mode 100755
+index 0000000..1b27ce4
+--- /dev/null
++++ b/configs/Lamobo_R1_defconfig
+@@ -0,0 +1,18 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_MACH_SUN7I=y
++CONFIG_DRAM_CLK=432
++CONFIG_GMAC_TX_DELAY=4
++CONFIG_VIDEO_COMPOSITE=y
++CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_SPL=y
++CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,SATAPWR=SUNXI_GPB(3)"
++# CONFIG_CMD_IMLS is not set
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++CONFIG_DM_ETH=y
++CONFIG_ETH_DESIGNWARE=y
++CONFIG_USB_EHCI_HCD=y
++
++
diff --git a/patch/u-boot/u-boot/sunxi-boot-splash.patch b/patch/u-boot/u-boot-next/sunxi-boot-splash.patch
similarity index 100%
rename from patch/u-boot/u-boot/sunxi-boot-splash.patch
rename to patch/u-boot/u-boot-next/sunxi-boot-splash.patch
diff --git a/patching.sh b/patching.sh
index 4e1fb89153..752406a0fb 100644
--- a/patching.sh
+++ b/patching.sh
@@ -128,5 +128,5 @@ patching_sources(){
 	
 	cd $SOURCES/$BOOTSOURCEDIR
 	grab_version "$SOURCES/$BOOTSOURCEDIR"
-	advanced_patch "u-boot" "$BOOTSOURCE" "$BOARD" "$UBOOTTAG $VER"
+	advanced_patch "u-boot" "$BOOTSOURCE-$BRANCH" "$BOARD" "$BOOTSOURCE-$BRANCH $VER"
 }
\ No newline at end of file