From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 17 Nov 2020 15:09:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/philmd-gitlab/tags/sdmmc-20201117' into staging
X-Git-Tag: v5.2.0~31
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f45fc83bc0a540676d592b59aef610b0b2ee59f6;p=mirror_qemu.git

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/sdmmc-20201117' into staging

SD/MMC patches

- Correctly handle 2 GB SCSD Memory Cards (Bin Meng)

CI jobs result:
. https://cirrus-ci.com/build/4688743904837632
. https://gitlab.com/philmd/qemu/-/pipelines/216829732
. https://travis-ci.org/github/philmd/qemu/builds/744026099

# gpg: Signature made Tue 17 Nov 2020 10:51:13 GMT
# 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-gitlab/tags/sdmmc-20201117:
  hw/sd: Fix 2 GiB card CSD register values

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

f45fc83bc0a540676d592b59aef610b0b2ee59f6