9
0
Fork 0

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:
Robert Schwebel 2007-12-17 19:50:41 +01:00 committed by Marc Kleine-Budde
parent 37443467a5
commit 85bacf61f6
2 changed files with 10 additions and 7 deletions

View File

@ -12,14 +12,15 @@ if [ x$1 = xnet ]; then
kernel=net
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"
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"
fi
@ -34,3 +35,4 @@ if [ $kernel = net ]; then
else
bootm /dev/nor0.kernel
fi

View File

@ -22,4 +22,5 @@ nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-P
bootargs="console=ttymxc0,115200"
mtdparts="128k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
rootpart="/dev/mtdblock3"
rootpart="/dev/mtdblock3"