Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190716' into...
commita1a4d49f60d2b899620ee2be4ebb991c4a90a026
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 16 Jul 2019 16:02:44 +0000 (16 17:02 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 16 Jul 2019 16:02:44 +0000 (16 17:02 +0100)
treee171f34afb0e36c472fc07fc1a826e4cec5deb4d
parent1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7
parent611c749c3b86fe377c94ea301feab3d9ce3bf617
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190716' into staging

pflash-next patches for v4.1.0-rc1

Trivial pflash fixes for rc1.

# gpg: Signature made Tue 16 Jul 2019 16:59:53 BST
# gpg:                using RSA key E3E32C2CDEADC0DE
# 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-gitlab/tags/pflash-next-20190716:
  hw/block/pflash_cfi01: Start state machine as READY to accept commands
  hw/block/pflash_cfi02: Explicit switch fallthrough for ERASE commands

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