summary refs log tree commit diff stats
path: root/scripts/nsis.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-11-17 15:09:43 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-11-17 15:09:43 +0000
commitf45fc83bc0a540676d592b59aef610b0b2ee59f6 (patch)
tree5356797d99451893175ebce19c03bb0dbff719e8 /scripts/nsis.py
parent6b728efcb01fd809e60f85093fd36ef63aa01dbf (diff)
parent575094b786e999e5fbd04c0456f518a5ebefab5b (diff)
downloadfocaccia-qemu-f45fc83bc0a540676d592b59aef610b0b2ee59f6.tar.gz
focaccia-qemu-f45fc83bc0a540676d592b59aef610b0b2ee59f6.zip
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>
Diffstat (limited to 'scripts/nsis.py')
0 files changed, 0 insertions, 0 deletions