From a7e01ed5fcf28aefa7325df7a450eb49f4b7b146 Mon Sep 17 00:00:00 2001
From: Robin Frousheger <Robin@home.froosh.net>
Date: Thu, 2 Aug 2018 17:25:34 +1000
Subject: [PATCH 1/2] rockchip: Allow rootfstype specified in armbianEnv.txt to
 be used e.g. Using btrfs on ASUS Tinkerboard

---
 config/bootscripts/boot-rockchip.cmd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/bootscripts/boot-rockchip.cmd b/config/bootscripts/boot-rockchip.cmd
index a4ff4dc8b9..651d2e9e83 100644
--- a/config/bootscripts/boot-rockchip.cmd
+++ b/config/bootscripts/boot-rockchip.cmd
@@ -4,6 +4,7 @@
 #
 
 setenv rootdev "/dev/mmcblk0p1"
+setenv rootfstype "ext4"
 setenv fdt_file "rk3288-miqi.dtb"
 setenv ramdisk_addr_r "0x21000000"
 setenv console "ttyS2,115200n8 console=tty1"
@@ -16,7 +17,7 @@ if load ${devtype} ${devnum}:1 ${ramdisk_addr_r} /boot/armbianEnv.txt || load ${
 	env import -t ${ramdisk_addr_r} ${filesize}
 fi
 
-setenv bootargs "consoleblank=0 scandelay root=${rootdev} rw console=${console} rootfstype=ext4 loglevel=${verbosity} rootwait usb-storage.quirks=${usbstoragequirks} ${extraargs}"
+setenv bootargs "consoleblank=0 scandelay root=${rootdev} rw console=${console} rootfstype=${rootfstype} loglevel=${verbosity} rootwait usb-storage.quirks=${usbstoragequirks} ${extraargs}"
 ext4load ${devtype} ${devnum}:1 ${fdt_addr_r} /boot/dtb/${fdt_file} || fatload ${devtype} ${devnum}:1 ${fdt_addr_r} dtb/${fdt_file} || ext4load ${devtype} ${devnum}:1 ${fdt_addr_r} dtb/${fdt_file}
 ext4load ${devtype} ${devnum}:1 ${ramdisk_addr_r} /boot/uInitrd || fatload ${devtype} ${devnum}:1 ${ramdisk_addr_r} uInitrd || ext4load ${devtype} ${devnum}:1 ${ramdisk_addr_r} uInitrd
 ext4load ${devtype} ${devnum}:1 ${kernel_addr_r} /boot/zImage || fatload ${devtype} ${devnum}:1 ${kernel_addr_r} zImage || ext4load ${devtype} ${devnum}:1 ${kernel_addr_r} zImage

From 65493e11f817bd105aeac3ec60bd54ccf5b1ffde Mon Sep 17 00:00:00 2001
From: Robin Frousheger <Robin@home.froosh.net>
Date: Thu, 2 Aug 2018 21:10:15 +1000
Subject: [PATCH 2/2] udoo: Allow rootfstype specified in armbianEnv.txt to be
 used

---
 config/bootscripts/boot-udoo-neo.cmd | 2 +-
 config/bootscripts/boot-udoo.cmd     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/bootscripts/boot-udoo-neo.cmd b/config/bootscripts/boot-udoo-neo.cmd
index 0208f777e6..72c9d79a92 100644
--- a/config/bootscripts/boot-udoo-neo.cmd
+++ b/config/bootscripts/boot-udoo-neo.cmd
@@ -24,7 +24,7 @@ fi
 if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
 if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttymxc0,115200"; fi
 
-setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait ${consoleargs} rd.dm=0 rd.luks=0 rd.lvm=0 rw uart_from_osc loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
+setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} rd.dm=0 rd.luks=0 rd.lvm=0 rw uart_from_osc loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
 
 ext2load mmc ${mmcdev}:${mmcpart} ${fw_load_addr} /boot/bin/m4startup.fw
 ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/zImage
diff --git a/config/bootscripts/boot-udoo.cmd b/config/bootscripts/boot-udoo.cmd
index 3010514cef..0d43f77701 100644
--- a/config/bootscripts/boot-udoo.cmd
+++ b/config/bootscripts/boot-udoo.cmd
@@ -24,7 +24,7 @@ if test "${console}" = "display" || test "${console}" = "both"; then setenv cons
 if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttymxc1,115200"; fi
 
 
-setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait ${consoleargs} video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 vt.global_cursor_default=0 loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
+setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 vt.global_cursor_default=0 loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
 
 ext4load mmc 0 ${ramdisk_addr} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr} uInitrd || ext4load mmc 0 ${ramdisk_addr} uInitrd
 ext4load mmc 0 ${loadaddr} /boot/zImage || fatload mmc 0 ${loadaddr} zImage