pcm038: fix default environment wrt. ip address
The boot script doesn't honour the ip= parameter when booting from flash only. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
This commit is contained in:
parent
37443467a5
commit
85bacf61f6
|
@ -12,14 +12,15 @@ if [ x$1 = xnet ]; then
|
||||||
kernel=net
|
kernel=net
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $root = flash ]; then
|
if [ x$ip = xdhcp ]; then
|
||||||
|
bootargs="$bootargs ip=dhcp"
|
||||||
|
else
|
||||||
|
bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ x$root = xflash ]; then
|
||||||
bootargs="$bootargs root=$rootpart rootfstype=jffs2"
|
bootargs="$bootargs root=$rootpart rootfstype=jffs2"
|
||||||
else
|
else
|
||||||
if [ x$ip = xdhcp ]; then
|
|
||||||
bootargs="$bootargs ip=dhcp"
|
|
||||||
else
|
|
||||||
bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
|
|
||||||
fi
|
|
||||||
bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp"
|
bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -34,3 +35,4 @@ if [ $kernel = net ]; then
|
||||||
else
|
else
|
||||||
bootm /dev/nor0.kernel
|
bootm /dev/nor0.kernel
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -22,4 +22,5 @@ nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-P
|
||||||
bootargs="console=ttymxc0,115200"
|
bootargs="console=ttymxc0,115200"
|
||||||
|
|
||||||
mtdparts="128k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
|
mtdparts="128k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
|
||||||
rootpart="/dev/mtdblock3"
|
rootpart="/dev/mtdblock3"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue