summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2012-11-24 23:03:13 +0100
committerAurelien Jarno <aurelien@aurel32.net>2013-01-01 13:05:57 +0100
commit5928023cef87847a295035487397b9ec701fdd6b (patch)
treec54d65438acaf55d171ba42ac46556f11dc7064e /hw
parent0f0b93980572726e69e32ff13e2d7fb72b936157 (diff)
downloadqemu-5928023cef87847a295035487397b9ec701fdd6b.tar.gz
qemu-5928023cef87847a295035487397b9ec701fdd6b.tar.bz2
qemu-5928023cef87847a295035487397b9ec701fdd6b.zip
pflash_cfi01: Suppress warning when Linux probes for AMD flash
There are several ARM and MIPS boards which are manufactured with either Intel (pflash_cfi01.c) or AMD (pflash_cfi02.c) flash memory. The Linux kernel supports both and first probes for AMD flash which resulted in one or two warnings from the Intel flash emulation: pflash_write: Unimplemented flash cmd sequence (offset 0000000000000000, wcycle 0x0 cmd 0x0 value 0xf000f0) pflash_write: Unimplemented flash cmd sequence (offset 0000000000000000, wcycle 0x0 cmd 0x0 value 0xf0) These warnings confuse users, so suppress them. Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw')
-rw-r--r--hw/pflash_cfi01.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 95e07e7cdb..aadedefb25 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -319,6 +319,9 @@ static void pflash_write(pflash_t *pfl, hwaddr offset,
DPRINTF("%s: Write to buffer\n", __func__);
pfl->status |= 0x80; /* Ready! */
break;
+ case 0xf0: /* Probe for AMD flash */
+ DPRINTF("%s: Probe for AMD flash\n", __func__);
+ goto reset_flash;
case 0xff: /* Read array mode */
DPRINTF("%s: Read array mode\n", __func__);
goto reset_flash;