From a7b8386b0286b721e4c0ef2c7ee6b1952cfcb96e Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Wed, 30 May 2018 11:46:32 +0000
Subject: [PATCH] Tiny Rockchip related fixes. Fix boot priority on MiQi. Start
 from SD if insterted, otherwise boot from eMMC, go up with u-boot to 2017.11,
 2018.03 hangs ...

---
 config/bootenv/rk3328-default.txt                 |  1 +
 config/bootenv/rockchip-default.txt               |  1 +
 config/bootscripts/boot-rockchip.cmd              |  2 +-
 config/sources/rockchip.conf                      |  2 +-
 packages/bsp/common/etc/init.d/firstrun           |  4 ++++
 .../board_miqi/fix_boot_order_sdcard_1st.patch    | 15 +++++++++++++++
 6 files changed, 23 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 config/sources/rockchip.conf
 create mode 100755 patch/u-boot/u-boot-rockchip/board_miqi/fix_boot_order_sdcard_1st.patch

diff --git a/config/bootenv/rk3328-default.txt b/config/bootenv/rk3328-default.txt
index af16115c05..31b0854eb4 100644
--- a/config/bootenv/rk3328-default.txt
+++ b/config/bootenv/rk3328-default.txt
@@ -1,2 +1,3 @@
 verbosity=1
+console=tty1
 console=both
diff --git a/config/bootenv/rockchip-default.txt b/config/bootenv/rockchip-default.txt
index b9bafac335..af4b3c2e7d 100644
--- a/config/bootenv/rockchip-default.txt
+++ b/config/bootenv/rockchip-default.txt
@@ -1 +1,2 @@
 verbosity=1
+ethaddr=06:e6:ad:01:68:3c
diff --git a/config/bootscripts/boot-rockchip.cmd b/config/bootscripts/boot-rockchip.cmd
index dd27fb2f3e..a4ff4dc8b9 100644
--- a/config/bootscripts/boot-rockchip.cmd
+++ b/config/bootscripts/boot-rockchip.cmd
@@ -6,7 +6,7 @@
 setenv rootdev "/dev/mmcblk0p1"
 setenv fdt_file "rk3288-miqi.dtb"
 setenv ramdisk_addr_r "0x21000000"
-setenv console "ttyS2,115200n8"
+setenv console "ttyS2,115200n8 console=tty1"
 setenv verbosity "1"
 
 itest.b ${devnum} == 0 && echo "U-boot loaded from SD"
diff --git a/config/sources/rockchip.conf b/config/sources/rockchip.conf
old mode 100755
new mode 100644
index baaa91fa16..0ca3fab801
--- a/config/sources/rockchip.conf
+++ b/config/sources/rockchip.conf
@@ -10,7 +10,7 @@ BOOTDELAY=0
 
 BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
 BOOTDIR=$MAINLINE_UBOOT_DIR
-BOOTBRANCH='tag:v2017.09'
+BOOTBRANCH='tag:v2017.11'
 
 SERIALCON=ttyS2
 
diff --git a/packages/bsp/common/etc/init.d/firstrun b/packages/bsp/common/etc/init.d/firstrun
index 5376ce63d4..451f7d233e 100755
--- a/packages/bsp/common/etc/init.d/firstrun
+++ b/packages/bsp/common/etc/init.d/firstrun
@@ -140,6 +140,10 @@ case "$1" in
 			ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
 			systemctl restart systemd-networkd
 			;;
+		*)
+			# change random mac from armbianEnv.txt
+			MACADDR=$(printf 'DC:44:6D:%02X:%02X:%02X\n' $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])
+			[[ -f /boot/armbianEnv.txt ]] && sed  -i "s/^ethaddr=.*/ethaddr=$MACADDR/" /boot/armbianEnv.txt
 	esac
 
 	systemctl disable firstrun
diff --git a/patch/u-boot/u-boot-rockchip/board_miqi/fix_boot_order_sdcard_1st.patch b/patch/u-boot/u-boot-rockchip/board_miqi/fix_boot_order_sdcard_1st.patch
new file mode 100755
index 0000000000..8b77647995
--- /dev/null
+++ b/patch/u-boot/u-boot-rockchip/board_miqi/fix_boot_order_sdcard_1st.patch
@@ -0,0 +1,15 @@
+diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
+index 35d948a..0710f02
+--- a/include/configs/rockchip-common.h
++++ b/include/configs/rockchip-common.h
+@@ -14,8 +14,8 @@
+ /* First try to boot from SD (index 0), then eMMC (index 1) */
+ #if CONFIG_IS_ENABLED(CMD_MMC)
+ 	#define BOOT_TARGET_MMC(func) \
+-		func(MMC, mmc, 0) \
+-		func(MMC, mmc, 1)
++		func(MMC, mmc, 1) \
++		func(MMC, mmc, 0)
+ #else
+ 	#define BOOT_TARGET_MMC(func)
+ #endif