summaryrefslogtreecommitdiff
path: root/include/configs/netstar.h
diff options
context:
space:
mode:
authorLadislav Michl <Ladislav.Michl@seznam.cz>2010-02-08 14:17:45 -0500
committerTom Rix <Tom.Rix@windriver.com>2010-03-07 12:36:34 -0600
commitde9a1e0d08301ea4925ee137af240424b107a608 (patch)
tree4ea6191d666d8260d2a1d96eb1eece174283d200 /include/configs/netstar.h
parent3a67566c1def7d2eb935b31b3b282ba893c3f330 (diff)
downloadu-boot-imx-de9a1e0d08301ea4925ee137af240424b107a608.zip
u-boot-imx-de9a1e0d08301ea4925ee137af240424b107a608.tar.gz
u-boot-imx-de9a1e0d08301ea4925ee137af240424b107a608.tar.bz2
NetStar: fix default environment
Correct switching partitions after upgrade and make it more readable. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'include/configs/netstar.h')
-rw-r--r--include/configs/netstar.h42
1 files changed, 21 insertions, 21 deletions
diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index 884dc09..df9402a 100644
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -156,7 +156,6 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_RUN
-
/*
* BOOTP options
*/
@@ -173,26 +172,27 @@
#define CONFIG_SYS_AUTOLOAD "n" /* No autoload */
#define CONFIG_BOOTCOMMAND "run fboot"
#define CONFIG_PREBOOT "run setup"
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "autostart=yes\0" \
- "ospart=0\0" \
- "setup=setenv bootargs console=ttyS0,$baudrate " \
- "$mtdparts\0" \
- "setpart=" \
- "if test -n $swapos; then " \
- "setenv swapos; saveenv; " \
- "else " \
- "if test $ospart -eq 0; then setenv ospart 1;" \
- "else setenv ospart 0; fi; " \
- "fi\0" \
- "nfsargs=setenv bootargs $bootargs " \
- "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off " \
- "nfsroot=$rootpath root=/dev/nfs\0" \
- "flashargs=run setpart;setenv bootargs $bootargs " \
- "root=mtd:rootfs$ospart ro " \
- "rootfstype=jffs2\0" \
- "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \
- "fboot=run flashargs;nboot kernel$ospart\0" \
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "autostart=yes\0" \
+ "ospart=0\0" \
+ "setup=setenv bootargs console=ttyS0,$baudrate $mtdparts\0" \
+ "setpart=" \
+ "if test -n $swapos; then " \
+ "setenv swapos; saveenv; " \
+ "if test $ospart -eq 0; then " \
+ "setenv ospart 1; " \
+ "else " \
+ "setenv ospart 0; " \
+ "fi; " \
+ "fi\0" \
+ "nfsargs=setenv bootargs $bootargs " \
+ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off " \
+ "nfsroot=$rootpath root=/dev/nfs\0" \
+ "flashargs=run setpart;setenv bootargs $bootargs " \
+ "root=mtd:rootfs$ospart ro " \
+ "rootfstype=jffs2\0" \
+ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \
+ "fboot=run flashargs;nboot kernel$ospart\0" \
"nboot=bootp;run nfsargs;tftp\0"
#if 0 /* feel free to disable for development */