summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-11-13 11:17:15 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-11-26 10:19:45 +0100
commit8eab50688c627c934cc9d5a44d9ec69f8c70b9fa (patch)
tree151a69af46dc467039427d6b1602431d86da7005
parent337b1456480b7497d0a68084d2f5806fe4f80f1c (diff)
downloadbarebox-8eab50688c627c934cc9d5a44d9ec69f8c70b9fa.tar.gz
barebox-8eab50688c627c934cc9d5a44d9ec69f8c70b9fa.tar.xz
mx35: environment
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--board/freescale-mx35-3-stack/env/bin/boot2
-rw-r--r--board/freescale-mx35-3-stack/env/bin/init12
-rw-r--r--board/freescale-mx35-3-stack/env/bin/update_root2
-rw-r--r--board/freescale-mx35-3-stack/env/config25
4 files changed, 21 insertions, 20 deletions
diff --git a/board/freescale-mx35-3-stack/env/bin/boot b/board/freescale-mx35-3-stack/env/bin/boot
index dfb59aa692..7bbff2d1f6 100644
--- a/board/freescale-mx35-3-stack/env/bin/boot
+++ b/board/freescale-mx35-3-stack/env/bin/boot
@@ -31,7 +31,7 @@ else
bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp"
fi
-bootargs="$bootargs mtdparts=physmap-flash.0:$nor_parts;imx_nand:$nand_parts"
+bootargs="$bootargs mtdparts=physmap-flash.0:$nor_parts;mxc_nand:$nand_parts"
if [ $kernel = net ]; then
if [ x$ip = xdhcp ]; then
diff --git a/board/freescale-mx35-3-stack/env/bin/init b/board/freescale-mx35-3-stack/env/bin/init
index cdf0f6b8eb..3bfd194913 100644
--- a/board/freescale-mx35-3-stack/env/bin/init
+++ b/board/freescale-mx35-3-stack/env/bin/init
@@ -16,12 +16,12 @@ if [ -e /dev/nand0 ]; then
source /env/bin/hush_hack
fi
-#if [ -z $eth0.ethaddr ]; then
-# while [ -z $eth0.ethaddr ]; do
-# readline "no MAC address set for eth0. please enter the one found on your board: " eth0.ethaddr
-# done
-# echo -a /env/config "eth0.ethaddr=$eth0.ethaddr"
-#fi
+if [ -z $eth0.ethaddr ]; then
+ while [ -z $eth0.ethaddr ]; do
+ readline "no MAC address set for eth0. please enter the one found on your board: " eth0.ethaddr
+ done
+ echo -a /env/config "eth0.ethaddr=$eth0.ethaddr"
+fi
echo
echo -n "Hit any key to stop autoboot: "
diff --git a/board/freescale-mx35-3-stack/env/bin/update_root b/board/freescale-mx35-3-stack/env/bin/update_root
index eaf36ebcea..a75137237b 100644
--- a/board/freescale-mx35-3-stack/env/bin/update_root
+++ b/board/freescale-mx35-3-stack/env/bin/update_root
@@ -2,7 +2,7 @@
. /env/config
-image=$uimage
+image=$jffs2
if [ x$1 = xnand ]; then
part=/dev/nand0.root.bb
elif [ x$1 = xnor ]; then
diff --git a/board/freescale-mx35-3-stack/env/config b/board/freescale-mx35-3-stack/env/config
index d6afdfbeba..75d0c8117c 100644
--- a/board/freescale-mx35-3-stack/env/config
+++ b/board/freescale-mx35-3-stack/env/config
@@ -1,28 +1,29 @@
#!/bin/sh
# can be either 'net', 'nor' or 'nand''
-kernel=net
-root=net
+kernel=nor
+root=nor
-uimage=uImage-pcm038
-jffs2=root-pcm038.jffs2
+uimage=uImage-mx35-3-stack
+jffs2=root-mx35-3-stack.jffs2
autoboot_timeout=3
-nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root"
+nfsroot="/path/to/nfs_root"
bootargs="console=ttymxc0,115200"
-nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nor_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)"
rootpart_nor="/dev/mtdblock3"
-
-nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nand_parts="256k(uboot)ro,256k(ubootenv),2048k(kernel),-(root)"
rootpart_nand="/dev/mtdblock7"
# use 'dhcp' to do dhcp in uboot and in kernel
ip=dhcp
# or set your networking parameters here
-#eth0.ipaddr=a.b.c.d
-#eth0.netmask=a.b.c.d
-#eth0.gateway=a.b.c.d
-#eth0.serverip=a.b.c.d
+eth0.ipaddr=192.168.42.250
+eth0.netmask=255.255.0.0
+eth0.gateway=192.168.23.2
+eth0.serverip=192.168.23.2
+#eth0.ethaddr=aa.bb.cc.dd.ee.ff
+