From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 13 May 2021 13:45:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/philmd/tags/pflash-20210511' into staging
X-Git-Tag: v6.1.0-rc0~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dab59ce031228066eb95a9c518846fcacfb0dbbf;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/philmd/tags/pflash-20210511' into staging

Parallel NOR Flash patches queue

- Simplify memory layout when no pflash_cfi02 mapping requested

# gpg: Signature made Tue 11 May 2021 17:12:58 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd/tags/pflash-20210511:
  hw/block/pflash_cfi02: Do not create aliases when not necessary
  hw/block/pflash_cfi02: Set romd mode in pflash_cfi02_realize()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

dab59ce031228066eb95a9c518846fcacfb0dbbf