From 6ae514413fc96041ba705b7707e31038cf475faf Mon Sep 17 00:00:00 2001
From: Tonymac32 <tonymckahan@gmail.com>
Date: Mon, 17 Apr 2017 01:14:10 -0400
Subject: [PATCH] Tinker return to using mainline U-boot

Mainline U-boot tested working for Tinker Board.
---
 config/sources/rockchip.conf | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/config/sources/rockchip.conf b/config/sources/rockchip.conf
index eb5900ce38..935d952851 100644
--- a/config/sources/rockchip.conf
+++ b/config/sources/rockchip.conf
@@ -43,13 +43,9 @@ if [[ $BOARD == "tinkerboard" ]]; then
 
 	UBOOT_TARGET_MAP=";;$SRC/lib/bin/rk3288_boot.bin u-boot-dtb.bin spl/u-boot-spl-dtb.bin"
 
-	#BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
-	#BOOTDIR=$MAINLINE_UBOOT_DIR
-	#BOOTBRANCH="branch:master"
-	# mainline uboot currently doesn't work
-	BOOTSOURCE='https://github.com/rockchip-linux/u-boot.git'
-	BOOTDIR='u-boot-rk-linux'
-	BOOTBRANCH="branch:release"
+	BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+	BOOTDIR=$MAINLINE_UBOOT_DIR
+	BOOTBRANCH="branch:master"
 
 	write_uboot_platform()
 	{