From: Koen Vandeputte <koen.vandeputte@ncentric.com>
Date: Mon, 22 Aug 2016 15:05:11 +0000 (+0200)
Subject: imx6: Fix pointing to msata/mmc bootdevs
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dc765f64c59a3e4a2d751685aec1f7a9bc3f2195;p=oweals%2Fopenwrt.git

imx6: Fix pointing to msata/mmc bootdevs

Point to correct devices when booting from msata or MMC
Changes fetched from Gateworks git

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
[Jo-Philipp Wich: rebased to apply against current LEDE version]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/target/linux/imx6/image/bootscript-ventana b/target/linux/imx6/image/bootscript-ventana
index 8775733698..dcf26bb959 100644
--- a/target/linux/imx6/image/bootscript-ventana
+++ b/target/linux/imx6/image/bootscript-ventana
@@ -1,4 +1,4 @@
-echo "Gateworks Ventana OpenWrt Boot script v1.00"
+echo "Gateworks Ventana OpenWrt Boot script v1.01"
 
 # set some defaults
 # set some defaults
@@ -35,9 +35,9 @@ if test -n "$bootdev" ; then
 	echo "Using bootdev from env: $bootdev"
 else
 	if itest.s "x${dtype}" == "xmmc" ; then
-		bootdev=mmcblk0
+		bootdev=mmcblk0p1
 	else
-		bootdev=sda
+		bootdev=sda1
 	fi
 fi
 
@@ -54,7 +54,7 @@ if itest.s "x${dtype}" == "xnand" ; then
 else
 	echo "Booting from block device ${bootdev}..."
 	setenv fsload "${fs}load ${dtype} ${disk}:1"
-	setenv root "root=/dev/${bootdev}"
+	setenv root "root=/dev/${bootdev} rootfstype=${fs} rootwait rw"
 fi
 
 setenv bootargs "${bootargs}" "${root}" "${video}" "${extra}"