summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-03-16 01:50:18 +0100
committerWolfgang Denk <wd@denx.de>2008-03-16 01:50:18 +0100
commite95bcc3661a78ccc094c365ecd2484d00a60f97d (patch)
tree0987662fbde9b8792a95ff00023bc22cfbaf2528 /include
parent0b8f2a27861a9fd06eb55a34f855ec9c5102aab4 (diff)
parentdecbe029b2a9d3333d02c433389b1c821eea96d7 (diff)
downloadu-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.zip
u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.tar.gz
u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.tar.bz2
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Conflicts: drivers/rtc/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mgcoge.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index 98facf2..b1e3d53 100644
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -105,12 +105,11 @@
"ramargs=setenv bootargs root=/dev/ram rw\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
- "addcon=setenv bootargs ${bootargs} console=ttyCPM0,,${baudrate}\0" \
+ "addcon=setenv bootargs ${bootargs} console=ttyCPM0,${baudrate}\0" \
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
"addip=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:" \
- "${netmask}:${hostname}:${netdev}:off panic=1 " \
- "console=${console}\0" \
+ "${netmask}:${hostname}:${netdev}:off panic=1\0" \
"net_nfs=tftp ${kernel_addr} ${bootfile}; " \
"tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcon;"\
"bootm ${kernel_addr} - ${fdt_addr}\0" \