diff options
author | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /doc/README.qemu_mips | |
parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
download | u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2 |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'doc/README.qemu_mips')
-rw-r--r-- | doc/README.qemu_mips | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/README.qemu_mips b/doc/README.qemu_mips index 476c5e6..c9ac3f3 100644 --- a/doc/README.qemu_mips +++ b/doc/README.qemu_mips @@ -15,4 +15,4 @@ create image: # dd of=flash bs=1k count=4k if=/dev/zero # dd of=flash bs=1k conv=notrunc if=u-boot.bin start it: -# qemu-system-mips -pflash flash -monitor null -nographic +# qemu-system-mips -M mips -pflash flash -monitor null -nographic |