diff options
| author | Juergen Beisert <juergen@kreuzholzen.de> | 2009-10-27 19:57:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-28 09:44:42 +0100 |
| commit | 5b28d03dbbfda2409a8bff4b77d5f38824a74782 (patch) | |
| tree | b7cd686fe0896d04ffd129aef70565d5061453f4 | |
| parent | f5194c3a3ef1f2ace56a7e5feff92ed63b76ae91 (diff) | |
| download | barebox-5b28d03dbbfda2409a8bff4b77d5f38824a74782.tar.gz barebox-5b28d03dbbfda2409a8bff4b77d5f38824a74782.tar.xz | |
A9M2440: Addapting the default environment
Adapting the default environment to support booting from network and NAND
Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
| -rw-r--r-- | board/a9m2440/env/bin/_update | 2 | ||||
| -rw-r--r-- | board/a9m2440/env/bin/boot | 14 | ||||
| -rw-r--r-- | board/a9m2440/env/bin/update_root | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/board/a9m2440/env/bin/_update b/board/a9m2440/env/bin/_update index fb7cbe8619..e76eac9bc7 100644 --- a/board/a9m2440/env/bin/_update +++ b/board/a9m2440/env/bin/_update @@ -24,8 +24,6 @@ if [ $? -ne 0 ] ; then exit 1 fi -unprotect $part - echo echo "erasing partition $part" erase $part diff --git a/board/a9m2440/env/bin/boot b/board/a9m2440/env/bin/boot index e1673a1da1..86e22cf9ff 100644 --- a/board/a9m2440/env/bin/boot +++ b/board/a9m2440/env/bin/boot @@ -12,16 +12,16 @@ if [ x$1 = xnet ]; then kernel=net fi -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 = xnand ]; then bootargs="$bootargs root=$rootpart_nand rootfstype=jffs2" -else +fi +if [ x$root = xnet ]; then bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp" + if [ x$ip = xdhcp ]; then + bootargs="$bootargs ip=dhcp" + else + bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::" + fi fi bootargs="$bootargs mtdparts=\"NAND 32MiB 3,3V 8-bit:$nand_parts\"" diff --git a/board/a9m2440/env/bin/update_root b/board/a9m2440/env/bin/update_root index 34139e5dce..46cbca5beb 100644 --- a/board/a9m2440/env/bin/update_root +++ b/board/a9m2440/env/bin/update_root @@ -2,6 +2,8 @@ . /env/config +part=/dev/nand0.root.bb + if [ x$1 = x ]; then image=$jffs2 else |