diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-12-17 19:50:41 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-12-17 19:50:41 +0100 |
| commit | 85bacf61f65c766ad3e9ea259402fae6cba5465a (patch) | |
| tree | e4752c302b86023615d3bc3e79adb7f628c9f931 | |
| parent | 37443467a54831745639111fa780a8d4b80e3b74 (diff) | |
| download | barebox-85bacf61f65c766ad3e9ea259402fae6cba5465a.tar.gz barebox-85bacf61f65c766ad3e9ea259402fae6cba5465a.tar.xz | |
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>
| -rw-r--r-- | board/pcm038/env/bin/boot | 14 | ||||
| -rw-r--r-- | board/pcm038/env/config | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/board/pcm038/env/bin/boot b/board/pcm038/env/bin/boot index 0e0119082c..71d4391591 100644 --- a/board/pcm038/env/bin/boot +++ b/board/pcm038/env/bin/boot @@ -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 + diff --git a/board/pcm038/env/config b/board/pcm038/env/config index 7b21f06666..c2752d5d99 100644 --- a/board/pcm038/env/config +++ b/board/pcm038/env/config @@ -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"
\ No newline at end of file +rootpart="/dev/mtdblock3" + |