diff --git a/config/boards/pinebook-a64.conf b/config/boards/pinebook-a64.conf
index b4776a046..6d90725fd 100644
--- a/config/boards/pinebook-a64.conf
+++ b/config/boards/pinebook-a64.conf
@@ -14,4 +14,4 @@ CLI_TARGET=""
 DESKTOP_TARGET="xenial:default"
 #
 CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
\ No newline at end of file
+DESKTOP_BETA_TARGET=""
diff --git a/config/sources/sun50iw1.conf b/config/sources/sun50iw1.conf
index dc4bdbadb..99c5d5858 100644
--- a/config/sources/sun50iw1.conf
+++ b/config/sources/sun50iw1.conf
@@ -49,12 +49,13 @@ case $BRANCH in
 	BOOTENV_FILE='sun50iw1-next.txt'
 	BOOTSOURCE='https://github.com/anarsoul/u-boot-pine64'
 	BOOTDIR=$MAINLINE_UBOOT_DIR
-	BOOTBRANCH='branch:pinebook-wip-20180617'
+	BOOTBRANCH='branch:pinebook-wip-20181104'
 	BOOTPATCHDIR='u-boot-sun50iw2'
 	UBOOT_USE_GCC='> 7.0'
 	UBOOT_TARGET_MAP=';;spl/sunxi-spl.bin u-boot.itb'
 	BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
 	GOVERNOR=ondemand
+
 	;;
 esac
 
diff --git a/patch/atf/atf-sunxi64/board_pinebook-a64/set-lpddr3-dram-voltage.patch b/patch/atf/atf-sunxi64/board_pinebook-a64/set-lpddr3-dram-voltage.patch.disable
similarity index 100%
rename from patch/atf/atf-sunxi64/board_pinebook-a64/set-lpddr3-dram-voltage.patch
rename to patch/atf/atf-sunxi64/board_pinebook-a64/set-lpddr3-dram-voltage.patch.disable
diff --git a/patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-emmc-support.patch b/patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-emmc-support.patch.disabled
similarity index 89%
rename from patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-emmc-support.patch
rename to patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-emmc-support.patch.disabled
index c80793423..011bb8246 100644
--- a/patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-emmc-support.patch
+++ b/patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-emmc-support.patch.disabled
@@ -23,12 +23,12 @@ diff --git a/configs/a64-olinuxino_defconfig b/configs/a64-olinuxino_defconfig
 index b32df99..4497dbe 100644
 --- a/configs/a64-olinuxino_defconfig
 +++ b/configs/a64-olinuxino_defconfig
-@@ -9,6 +9,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-olinuxino"
+@@ -9,6 +9,8 @@ CONFIG_NR_DRAM_BANKS=1
  # CONFIG_CMD_FLASH is not set
  # CONFIG_SPL_DOS_PARTITION is not set
  # CONFIG_SPL_EFI_PARTITION is not set
 +CONFIG_SPL_SPI_FLASH_SUPPORT=y
 +CONFIG_SPL_SPI_SUNXI=y
+ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-olinuxino"
  CONFIG_SUN8I_EMAC=y
  CONFIG_USB_EHCI_HCD=y
- CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
diff --git a/patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-usb-boot-support.patch b/patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-usb-boot-support.patch.disabled
similarity index 100%
rename from patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-usb-boot-support.patch
rename to patch/u-boot/u-boot-sun50iw2/add-a64-olinuxino-usb-boot-support.patch.disabled
diff --git a/patch/u-boot/u-boot-sun50iw2/add-teres.patch b/patch/u-boot/u-boot-sun50iw2/add-teres.patch
index 51b69f646..b15de0698 100644
--- a/patch/u-boot/u-boot-sun50iw2/add-teres.patch
+++ b/patch/u-boot/u-boot-sun50iw2/add-teres.patch
@@ -174,13 +174,13 @@ index 0000000000..da33b4131d
 +CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -392,7 +392,8 @@ dtb-$(CONFIG_MACH_SUN50I) += \
- 	sun50i-a64-orangepi-win.dtb \
+@@ -406,7 +406,8 @@ dtb-$(CONFIG_MACH_SUN50I) += \
  	sun50i-a64-pine64-plus.dtb \
  	sun50i-a64-pine64.dtb \
--	sun50i-a64-pinebook.dtb
-+	sun50i-a64-pinebook.dtb \
-+	sun50i-a64-teres-i.dtb
+ 	sun50i-a64-pinebook.dtb \
+-	sun50i-a64-sopine-baseboard.dtb
++	sun50i-a64-sopine-baseboard.dtb \
++	sun50i-a64-teres-i.dtb 
  dtb-$(CONFIG_MACH_SUN9I) += \
  	sun9i-a80-optimus.dtb \
  	sun9i-a80-cubieboard4.dtb \
diff --git a/patch/u-boot/u-boot-sun50iw2/enable-autoboot-keyed.patch b/patch/u-boot/u-boot-sun50iw2/enable-autoboot-keyed.patch
index c59629dc8..70aab22d4 100644
--- a/patch/u-boot/u-boot-sun50iw2/enable-autoboot-keyed.patch
+++ b/patch/u-boot/u-boot-sun50iw2/enable-autoboot-keyed.patch
@@ -2,15 +2,15 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
 index 53eae8953e..1e931a0eb0 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -696,6 +696,8 @@ config ARCH_SUNXI
- 	select USB_STORAGE if DISTRO_DEFAULTS
+@@ -843,6 +843,8 @@ config ARCH_SUNXI
  	select USB_KEYBOARD if DISTRO_DEFAULTS
+ 	select USB_STORAGE if DISTRO_DEFAULTS
  	select USE_TINY_PRINTF
 +	imply AUTOBOOT_KEYED
-+	imply AUTOBOOT_KEYED_CTRLC
++	imply AUTOBOOT_KEYED_CTRLC 
+ 	imply CMD_DM
  	imply CMD_GPT
- 	imply FAT_WRITE
- 	imply PRE_CONSOLE_BUFFER
+ 	imply CMD_UBI if NAND
 diff --git a/cmd/Kconfig b/cmd/Kconfig
 index d6d130edfa..46ed3a9d76 100644
 --- a/cmd/Kconfig
diff --git a/patch/u-boot/u-boot-sun50iw2/fix-A64-mmc2-remove-PC1-pin.patch b/patch/u-boot/u-boot-sun50iw2/fix-A64-mmc2-remove-PC1-pin.patch
deleted file mode 100644
index 9d4ff177c..000000000
--- a/patch/u-boot/u-boot-sun50iw2/fix-A64-mmc2-remove-PC1-pin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi
-index 76b9311..3655f5e 100644
---- a/arch/arm/dts/sun50i-a64.dtsi
-+++ b/arch/arm/dts/sun50i-a64.dtsi
-@@ -295,7 +295,7 @@
- 			};
- 
- 			mmc2_pins: mmc2-pins {
--				pins = "PC1", "PC5", "PC6", "PC8", "PC9",
-+				pins = "PC5", "PC6", "PC8", "PC9",
- 				       "PC10","PC11", "PC12", "PC13",
- 				       "PC14", "PC15", "PC16";
- 				function = "mmc2";