* Running the init_console routine is needed as all am335x boards do
  not use the same console.

Signed-off-by: Jacob Stiffler <[email protected]>
---
 setup-uboot-env-am335x.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup-uboot-env-am335x.sh b/setup-uboot-env-am335x.sh
index 6950caf..80b0a52 100644
--- a/setup-uboot-env-am335x.sh
+++ b/setup-uboot-env-am335x.sh
@@ -189,7 +189,7 @@ if [ "$kernel" -eq "1" ]; then
                do_expect "\"$prompt\"" "send \"setenv ip_method dhcp\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv nfsopts 
'nolock,v3,tcp,rsize=4096,wsize=4096'\"" $cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv getuenv 'if mmc rescan; 
then if run loadbootenv; then run importbootenv; fi; fi;'\"" 
$cwd/setupBoard.minicom
-               do_expect "\"$prompt\"" "send setenv bootcmd 'run findfdt; run 
getuenv; setenv autoload no;dhcp ;tftp \${loadaddr} $kernelimage; tftp 
\${fdtaddr} \${fdtfile}; run netargs; bootz \${loadaddr} - \${fdtaddr}'" 
$cwd/setupBoard.minicom
+               do_expect "\"$prompt\"" "send setenv bootcmd 'run findfdt; run 
init_console; run getuenv; setenv autoload no;dhcp ;tftp \${loadaddr} 
$kernelimage; tftp \${fdtaddr} \${fdtfile}; run netargs; bootz \${loadaddr} - 
\${fdtaddr}'" $cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"saveenv\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"boot\"" $cwd/setupBoard.minicom
        else
@@ -198,7 +198,7 @@ if [ "$kernel" -eq "1" ]; then
                do_expect "\"$prompt\"" "send \"setenv bootfile $kernelimage\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv ip_method none\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv getuenv 'if mmc rescan; 
then if run loadbootenv; then run importbootenv; fi; fi;'\"" 
$cwd/setupBoard.minicom
-               do_expect "\"$prompt\"" "send setenv bootcmd 'run findfdt; run 
getuenv; setenv autoload no; dhcp ; tftp \${loadaddr} $kernelimage; tftp 
\${fdtaddr} \${fdtfile}; run args_mmc; bootz \${loadaddr} - \${fdtaddr}'" 
$cwd/setupBoard.minicom
+               do_expect "\"$prompt\"" "send setenv bootcmd 'run findfdt; run 
init_console; run getuenv; setenv autoload no; dhcp ; tftp \${loadaddr} 
$kernelimage; tftp \${fdtaddr} \${fdtfile}; run args_mmc; bootz \${loadaddr} - 
\${fdtaddr}'" $cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"saveenv\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"boot\"" $cwd/setupBoard.minicom
        fi
@@ -211,7 +211,7 @@ else
                do_expect "\"$prompt\"" "send \"setenv ip_method dhcp\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv nfsopts 
'nolock,v3,tcp,rsize=4096,wsize=4096'\"" $cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv getuenv 'if mmc rescan; 
then if run loadbootenv; then run importbootenv; fi; fi;'\"" 
$cwd/setupBoard.minicom
-               do_expect "\"$prompt\"" "send setenv bootcmd 'setenv autoload 
no; mmc rescan; run findfdt; run getuenv; setenv devtype mmc; run loadimage; 
run loadfdt; run netargs; bootz \${loadaddr} - \${fdtaddr}'" 
$cwd/setupBoard.minicom
+               do_expect "\"$prompt\"" "send setenv bootcmd 'setenv autoload 
no; mmc rescan; run findfdt; run init_console; run getuenv; setenv devtype mmc; 
run loadimage; run loadfdt; run netargs; bootz \${loadaddr} - \${fdtaddr}'" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"saveenv\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"boot\"" $cwd/setupBoard.minicom
            else
@@ -219,7 +219,7 @@ else
                do_expect "\"$prompt\"" "send \"setenv ip_method none\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv bootfile zImage\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv getuenv 'if mmc rescan; 
then if run loadbootenv; then run importbootenv; fi; fi;'\"" 
$cwd/setupBoard.minicom
-               do_expect "\"$prompt\"" "send setenv bootcmd 'mmc rescan; run 
findfdt; run getuenv; setenv devtype mmc; run loadimage; run loadfdt; run 
args_mmc; bootz \${loadaddr} - \${fdtaddr}'" $cwd/setupBoard.minicom
+               do_expect "\"$prompt\"" "send setenv bootcmd 'mmc rescan; run 
findfdt; run init_console; run getuenv; setenv devtype mmc; run loadimage; run 
loadfdt; run args_mmc; bootz \${loadaddr} - \${fdtaddr}'" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"saveenv\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"boot\"" $cwd/setupBoard.minicom
 
-- 
1.9.1

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to