summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-09 22:18:58 +0200
committerWolfgang Denk <wd@denx.de>2008-05-09 22:18:58 +0200
commit356cd17cc289e2dac409d21607618650d6f388a5 (patch)
treefce11759308e036087dd5197f52d54a8d0602ae7 /board
parentef2642625cbfb1c3695e3478d08ae515052a4950 (diff)
parent726c0f1e5f108dccea052965123b95837d2bd402 (diff)
downloadtalos-obmc-uboot-356cd17cc289e2dac409d21607618650d6f388a5.tar.gz
talos-obmc-uboot-356cd17cc289e2dac409d21607618650d6f388a5.zip
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'board')
-rw-r--r--board/qemu-mips/README6
-rw-r--r--board/qemu-mips/qemu-mips.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/board/qemu-mips/README b/board/qemu-mips/README
index 39570b13db..4c1f8edc9b 100644
--- a/board/qemu-mips/README
+++ b/board/qemu-mips/README
@@ -1,4 +1,4 @@
-By Vlad Lungu vlad@comsys.ro 2007-Oct-01
+By Vlad Lungu vlad.lungu@windriver.com 2007-Oct-01
----------------------------------------
Qemu is a full system emulator. See
@@ -9,3 +9,7 @@ Limitations & comments
Supports the "-m mips" configuration of qemu: serial,NE2000,IDE.
Support is big endian only for now (or at least this is what I tested).
Derived from au1x00 with a lot of things cut out.
+
+Supports emulated flash (patch Jean-Christophe PLAGNIOL-VILLARD) with
+recent qemu versions. When using emulated flash, launch with
+-pflash <filename> and erase mips_bios.bin.
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index a6ad7b9ab3..68690743d6 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -1,6 +1,6 @@
/*
* (C) Copyright 2007
- * Vlad Lungu vlad@comsys.ro
+ * Vlad Lungu vlad.lungu@windriver.com
*
* See file CREDITS for list of people who contributed to this
* project.
OpenPOWER on IntegriCloud