Forráskód Böngészése

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 <[email protected]>
[Jo-Philipp Wich: rebased to apply against current LEDE version]
Signed-off-by: Jo-Philipp Wich <[email protected]>
Koen Vandeputte 9 éve
szülő
commit
dc765f64c5
1 módosított fájl, 4 hozzáadás és 4 törlés
  1. 4 4
      target/linux/imx6/image/bootscript-ventana

+ 4 - 4
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
 # set some defaults
 # set some defaults
@@ -35,9 +35,9 @@ if test -n "$bootdev" ; then
 	echo "Using bootdev from env: $bootdev"
 	echo "Using bootdev from env: $bootdev"
 else
 else
 	if itest.s "x${dtype}" == "xmmc" ; then
 	if itest.s "x${dtype}" == "xmmc" ; then
-		bootdev=mmcblk0
+		bootdev=mmcblk0p1
 	else
 	else
-		bootdev=sda
+		bootdev=sda1
 	fi
 	fi
 fi
 fi
 
 
@@ -54,7 +54,7 @@ if itest.s "x${dtype}" == "xnand" ; then
 else
 else
 	echo "Booting from block device ${bootdev}..."
 	echo "Booting from block device ${bootdev}..."
 	setenv fsload "${fs}load ${dtype} ${disk}:1"
 	setenv fsload "${fs}load ${dtype} ${disk}:1"
-	setenv root "root=/dev/${bootdev}"
+	setenv root "root=/dev/${bootdev} rootfstype=${fs} rootwait rw"
 fi
 fi
 
 
 setenv bootargs "${bootargs}" "${root}" "${video}" "${extra}"
 setenv bootargs "${bootargs}" "${root}" "${video}" "${extra}"