ramips: set uImage name of WeVO 11AC NAS and W2914NS v2

[oweals/openwrt.git] / target / linux / imx6 / image / bootscript-ventana

diff --git a/target/linux/imx6/image/bootscript-ventana b/target/linux/imx6/image/bootscript-ventana
index 87757336989bafa6f8313a8221298bb4c298a03c..941afb519aeae4b2b55611f37a41e5419450a146 100644 (file)
--- 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,19 +54,22 @@ 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}"
 if ${fsload} ${loadaddr} ${bootdir}/uImage; then
        if ${fsload} ${fdt_addr} ${bootdir}/${fdt_file}; then
                echo Loaded DTB from ${bootdir}/${fdt_file}
+               test -n "$fixfdt" && run fixfdt
                bootm ${loadaddr} - ${fdt_addr}
        elif ${fsload} ${fdt_addr} ${bootdir}/${fdt_file1}; then
                echo Loaded DTB from ${bootdir}/${fdt_file1}
+               test -n "$fixfdt" && run fixfdt
                bootm ${loadaddr} - ${fdt_addr}
        elif ${fsload} ${fdt_addr} ${bootdir}/${fdt_file2}; then
                echo Loaded DTB from ${bootdir}/${fdt_file2}
+               test -n "$fixfdt" && run fixfdt
                bootm ${loadaddr} - ${fdt_addr}
        else
                echo "Error loading device-tree"