From: a0232989 <[email protected]>

There is a documented issue where the u-boot dhcp command,
when autoboot is set to "no", will reset serverip to the
gateway ip address. This is a workaround that should not
have any negative affect on these scripts and will prevent
this issue for occuring.

Issue:
https://stackoverflow.com/questions/13975468/in-u-boot-can-the-dhcp-command-automatically-set-the-serverip-environment-varia

Note: we display this behavior in older scripts, but dropped
the nomenclature lately and default NFS setups do not work
out of the box as a result.

Signed-off-by: Caleb Robey <[email protected]>
---
 setup-uboot-env-am335x.sh     | 4 ++--
 setup-uboot-env-am43x.sh      | 2 +-
 setup-uboot-env-am57xx-evm.sh | 2 +-
 setup-uboot-env-am65x.sh      | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/setup-uboot-env-am335x.sh b/setup-uboot-env-am335x.sh
index f129875..687461b 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 
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 setenv bootcmd 'run findfdt; run 
init_console; run getuenv; setenv autoload no;dhcp ;setenv serverip $ip;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 
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 setenv bootcmd 'run findfdt; run 
init_console; run getuenv; setenv autoload no; dhcp ;setenv serverip $ip; 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
diff --git a/setup-uboot-env-am43x.sh b/setup-uboot-env-am43x.sh
index 24bc58a..8b8254b 100644
--- a/setup-uboot-env-am43x.sh
+++ b/setup-uboot-env-am43x.sh
@@ -144,7 +144,7 @@ if [ "$kernel" -eq "1" ]; then
                do_expect "\"$prompt\"" "send \"setenv nfsopts 
'nolock,v3,tcp,rsize=4096,wsize=4096'\"" $cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv devtype mmc\"" 
$cwd/setupBoard.minicom
                do_expect "\"$prompt\"" "send \"setenv getuenv 'setenv devnum 
\${mmcdev}; 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 
getuenv; setenv autoload no;dhcp ;setenv serverip $ip; 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
diff --git a/setup-uboot-env-am57xx-evm.sh b/setup-uboot-env-am57xx-evm.sh
index 323c134..dfd9486 100644
--- a/setup-uboot-env-am57xx-evm.sh
+++ b/setup-uboot-env-am57xx-evm.sh
@@ -156,7 +156,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 'mmc dev 
\${mmcdev}; 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 
getuenv; setenv autoload no;dhcp ;setenv serverip $ip;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
diff --git a/setup-uboot-env-am65x.sh b/setup-uboot-env-am65x.sh
index b6e043b..60045ae 100644
--- a/setup-uboot-env-am65x.sh
+++ b/setup-uboot-env-am65x.sh
@@ -144,14 +144,13 @@ do_expect "\"$prompt\"" "send \"reset\"" 
$cwd/setupBoard.minicom
 do_expect "\"stop autoboot:\"" "send \" \"" $cwd/setupBoard.minicom
 
 # Configurable settings
-do_expect "\"$prompt\"" "send \"setenv serverip $ip\"" $cwd/setupBoard.minicom
 do_expect "\"$prompt\"" "send \"setenv nfs_root $rootpath\"" 
$cwd/setupBoard.minicom
 do_expect "\"$prompt\"" "send \"setenv name_kern $kernelimage\"" 
$cwd/setupBoard.minicom
 
 # General macros
 do_expect "\"$prompt\"" "send \"setenv bootcmd 'run findfdt; run envboot; run 
setup_\${kern_boot}; run init_\${rootfs_boot}; run get_kern_\${kern_boot}; run 
get_fdt_\${kern_boot}; run get_overlay_\${kern_boot}; run run_kern'\"" 
$cwd/setupBoard.minicom
 
-do_expect "\"$prompt\"" "send \"setenv init_net 'run args_all args_net; setenv 
autoload no; dhcp'\"" $cwd/setupBoard.minicom
+do_expect "\"$prompt\"" "send \"setenv init_net 'run args_all args_net; setenv 
autoload no; dhcp; setenv serverip $ip'\"" $cwd/setupBoard.minicom
 do_expect "\"$prompt\"" "send \"setenv args_net 'setenv bootargs 
console=\${console} \${optargs} rootfstype=nfs root=/dev/nfs rw 
nfsroot=\${serverip}:\${nfs_root},\${nfs_options} ip=dhcp'\"" 
$cwd/setupBoard.minicom
 do_expect "\"$prompt\"" "send \"setenv get_kern_net 'tftp \${loadaddr} 
\${name_kern}'\"" $cwd/setupBoard.minicom
 do_expect "\"$prompt\"" "send \"setenv get_fdt_net 'tftp \${fdtaddr} 
\${name_fdt}'\"" $cwd/setupBoard.minicom
@@ -159,7 +158,7 @@ do_expect "\"$prompt\"" "send \"setenv get_overlay_net 'fdt 
address \${fdtaddr};
 
 do_expect "\"$prompt\"" "send \"setenv nfs_options 
'nolock,v3,tcp,rsize=4096,wsize=4096'\"" $cwd/setupBoard.minicom
 do_expect "\"$prompt\"" "send \"setenv setup_mmc ''\"" $cwd/setupBoard.minicom
-do_expect "\"$prompt\"" "send \"setenv setup_net 'setenv autoload no; dhcp'\"" 
$cwd/setupBoard.minicom
+do_expect "\"$prompt\"" "send \"setenv setup_net 'setenv autoload no; dhcp; 
setenv serverip $ip'\"" $cwd/setupBoard.minicom
 
 
 
-- 
2.17.1

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

Reply via email to