Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr

This commit is contained in:
Stefan Roese
2007-03-01 21:16:58 +01:00
2 changed files with 8 additions and 6 deletions

View File

@@ -115,7 +115,7 @@
":${hostname}:${netdev}:off panic=1\0" \
"flash_nfs=run nfsargs addip;" \
"bootm ${kernel_addr}\0" \
"flash_nand=nand_args addip addcon;bootm ${kernel_addr}\0" \
"flash_nand=run nand_args addip addcon;bootm ${kernel_addr}\0" \
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0" \
"rootpath=/opt/eldk/ppc_4xx\0" \
"bootfile=/tftpboot/sc3/uImage\0" \