summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-09-27 13:48:24 +0200
committerStefan Roese <sr@denx.de>2007-09-27 13:48:24 +0200
commit636538c520ed118e5e50f592250232a5f943fb84 (patch)
tree6e6d4f84cc3e448c5c803bd5d28b43beb0e89943
parent3e954beb614b5b190d7f4f4c3b641437a0132e35 (diff)
parent04625764cc93ce8a61625ac19d7fe2a2ceee8143 (diff)
downloadu-boot-imx-636538c520ed118e5e50f592250232a5f943fb84.zip
u-boot-imx-636538c520ed118e5e50f592250232a5f943fb84.tar.gz
u-boot-imx-636538c520ed118e5e50f592250232a5f943fb84.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/lwmon5
-rw-r--r--include/configs/lwmon5.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index a9db086..8ec4742 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -200,12 +200,13 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \
"addtty=setenv bootargs ${bootargs} console=ttyS1,${baudrate}\0"\
- "flash_nfs=run nfsargs addip addtty;" \
+ "addmisc=setenv bootargs ${bootargs} rtc-pcf8563.probe=0,0x51\0"\
+ "flash_nfs=run nfsargs addip addtty addmisc;" \
"bootm ${kernel_addr}\0" \
- "flash_self=run ramargs addip addtty;" \
+ "flash_self=run ramargs addip addtty addmisc;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
- "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \
- "bootm\0" \
+ "net_nfs=tftp 200000 ${bootfile};" \
+ "run nfsargs addip addtty addmisc;bootm\0" \
"rootpath=/opt/eldk/ppc_4xxFP\0" \
"bootfile=/tftpboot/lwmon5/uImage\0" \
"kernel_addr=FC000000\0" \