From bbe299398ad6b3619f5ff07849f23c3a6799832d Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Mon, 17 Apr 2017 21:36:04 +0200
Subject: [PATCH] Switch MiQi to mainline U-boot. Support starts at 2017.05,
 currently attached to master branch. Tested

---
 config/sources/rockchip.conf | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/config/sources/rockchip.conf b/config/sources/rockchip.conf
index 935d952851..24de0765d2 100644
--- a/config/sources/rockchip.conf
+++ b/config/sources/rockchip.conf
@@ -1,15 +1,16 @@
 BOOTSCRIPT="boot-rockchip.cmd:boot.cmd"
 BOOTENV_FILE='rockchip-default.txt'
-UBOOT_TARGET_MAP=";;$SRC/lib/bin/rk3288_boot.bin u-boot-dtb.img spl/u-boot-spl-dtb.bin"
+UBOOT_TARGET_MAP=";;$SRC/lib/bin/rk3288_boot.bin u-boot-dtb.bin spl/u-boot-spl-dtb.bin"
 
 UBOOT_ALT_GCC='> 6.1'
 
 HAS_UUID_SUPPORT=yes
 BOOTDELAY=0
 
-BOOTSOURCE='https://github.com/mqmaker/u-boot-rockchip'
-BOOTBRANCH='branch:miqi/devel'
-BOOTDIR='u-boot-miqi'
+BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
+BOOTDIR=$MAINLINE_UBOOT_DIR
+BOOTBRANCH="branch:master"
+
 SERIALCON=ttyS2
 
 case $BRANCH in
@@ -31,31 +32,15 @@ CPUMIN="600000"
 CPUMAX="1900000"
 GOVERNOR="conservative"
 
+
 write_uboot_platform()
 {
 	dd if=/dev/zero of=$2 bs=1k count=1023 seek=1 status=noxfer > /dev/null 2>&1
 	mkimage -n rk3288 -T rksd -d $1/u-boot-spl-dtb.bin $1/out > /dev/null 2>&1
-	dd if=$1/out of=$2 seek=64 status=noxfer > /dev/null 2>&1
-	dd if=$1/u-boot-dtb.img of=$2 seek=256 status=noxfer > /dev/null 2>&1
+	cat $1/u-boot-dtb.bin >> $1/out
+	dd if=$1/out of=$2 seek=64 conv=notrunc > /dev/null 2>&1
 }
 
-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"
-
-	write_uboot_platform()
-	{
-		dd if=/dev/zero of=$2 bs=1k count=1023 seek=1 status=noxfer > /dev/null 2>&1
-		mkimage -n rk3288 -T rksd -d $1/u-boot-spl-dtb.bin $1/out > /dev/null 2>&1
-		cat $1/u-boot-dtb.bin >> $1/out 
-		dd if=$1/out of=$2 seek=64 conv=notrunc > /dev/null 2>&1
-	}
-fi
-
 
 family_tweaks()
 {