diff options
author | Eric Bénard <eric@eukrea.com> | 2010-05-25 12:01:29 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-05-26 10:34:58 +0200 |
commit | 6aaef710ce98eb0eef5bf13a6ae05447b7503cc4 (patch) | |
tree | 95ab07a25f263842a2a279f4608c794ee22e0671 /board | |
parent | b6738258b82595de56dfa3f285b263cac0c0dcbe (diff) | |
download | barebox-6aaef710ce98eb0eef5bf13a6ae05447b7503cc4.tar.gz barebox-6aaef710ce98eb0eef5bf13a6ae05447b7503cc4.tar.xz |
eukrea_cpuimx27: update env
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'board')
-rw-r--r-- | board/eukrea_cpuimx27/env/bin/boot | 10 | ||||
-rw-r--r-- | board/eukrea_cpuimx27/env/config | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/board/eukrea_cpuimx27/env/bin/boot b/board/eukrea_cpuimx27/env/bin/boot index 7bbff2d1f6..7272e56763 100644 --- a/board/eukrea_cpuimx27/env/bin/boot +++ b/board/eukrea_cpuimx27/env/bin/boot @@ -17,10 +17,14 @@ if [ x$1 = xnor ]; then kernel=nor fi -if [ x$ip = xdhcp ]; then - bootargs="$bootargs ip=dhcp" +if [ x$root = xnet ]; then + if [ x$ip = xdhcp ]; then + bootargs="$bootargs ip=dhcp" + else + bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::" + fi else - bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::" + bootargs="$bootargs ip=off" fi if [ x$root = xnand ]; then diff --git a/board/eukrea_cpuimx27/env/config b/board/eukrea_cpuimx27/env/config index 183787e5ca..505ada39c7 100644 --- a/board/eukrea_cpuimx27/env/config +++ b/board/eukrea_cpuimx27/env/config @@ -4,16 +4,16 @@ kernel=nor root=nor -uimage=cpuimx27/uImage -jffs2=cpuimx27/rootfs.jffs2 +uimage=mx27/uImage +jffs2=mx27/rootfs.jffs2 -autoboot_timeout=3 +autoboot_timeout=1 -# TFP410-SVGA TFP410-VGA CMO-QVGA Optrex-WVGA Sharp-QVGA-EK +# DVI-SVGA DVI-VGA CMO-QVGA video="CMO-QVGA" -bootargs="console=ttymxc0,115200 fec_mac=$eth0.ethaddr rtc-pcf8563.probe=0,0x51 video=mxcfb:$video" +bootargs="console=ttymxc0,115200 fec_mac=$eth0.ethaddr video=mxcfb:$video" -nor_parts="256k(barebox)ro,128k(bareboxenv),1792k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),2176k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" nand_parts="-(nand)" @@ -28,4 +28,4 @@ ip=dhcp #eth0.ipaddr=a.b.c.d #eth0.netmask=a.b.c.d #eth0.gateway=a.b.c.d -eth0.serverip=192.168.1.15 +#eth0.serverip=a.b.c.d |