diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-08-04 08:57:07 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-08-04 08:57:07 -0400 |
| commit | a41280fd5b94c49089f7631c6fa8bb9c308b7962 (patch) | |
| tree | fc8deca46c27bed63aa2554c146f17cd11b47ad4 | |
| parent | a666a84b32690fa414325ab23e50616f91ef00b1 (diff) | |
| parent | 13ed972b4ce57198914a37217251d30fbec20e41 (diff) | |
| download | qemu-a41280fd5b94c49089f7631c6fa8bb9c308b7962.zip qemu-a41280fd5b94c49089f7631c6fa8bb9c308b7962.tar.gz qemu-a41280fd5b94c49089f7631c6fa8bb9c308b7962.tar.bz2 | |
Merge tag 'pull-aspeed-20250804' of https://github.com/legoater/qemu into staging
aspeed queue:
* Fixed vbootrom build under roms/
* Updated vbootrom image to 183c9ff805
* Fixed SMC model of AST1030 SoC
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmiQkpMACgkQUaNDx8/7
# 7KFVFw//X8mpLW97oCdh2ZuelkwQh+udAn34/f8cZWu97g9/Dmi6oDNb/GmPy5t2
# lFNg4hCSBh3JcRbHSMLVieE3lZLi5XuRb/g64TSH0gzgfhFKaPsqxzaD51R5cxVF
# JG9JSsGKJdbp1inWZvr1uEZsioAOdUPP4qeD+WLoTHKrhSPCrUHsjslVmReBKu/O
# sbgTGHkI8RJA6knz+j5JzXgy5y7XGsfbkl3pWlI8Ni9l6VDVrgfCcSgGtjQdzF4Q
# J/QtpYYjo6crJ4wbvAPhKP3RZNNl0m60oxn0BSLFzrM3fZ95VP4pGVOrkCKtZLgG
# Q0KvHcDKvm3BsgLPaUeyMjYHKbku2f/U3acsY4VqfLbvLNarmsG8OtFPiEs1tKnu
# Dkqb1Ac85O/8dKohyIFhxEy1nEY4iW4495iDD2CklD2lY1Ck+bFkwC2jBNfpgaO6
# xzfLPpiyyU+GbnXbV5HASHland+5AyIjxEKfYpIcARIsfuDOR0qYPl/wmPkV8utO
# /X0cKHZxSZ0x3E7xiOwTo6ZIgKdYbNEljTRT0AYxChB/ZRIEByQvYnwAXaL9IqLc
# qSc2GRXTy+G8WNy4z1kn2B0Sp9rENvB5uzoRGZ1PtwBySclzUHICQ653a7HKEYeH
# imXU9dGNhkQ+RMdA9+bZ3B3H8ykJDtX27woK6yerlbk3CUT9ZIs=
# =oAuL
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 04 Aug 2025 06:59:31 EDT
# gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@redhat.com>" [full]
# gpg: aka "Cédric Le Goater <clg@kaod.org>" [full]
# Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1
* tag 'pull-aspeed-20250804' of https://github.com/legoater/qemu:
hw/ssi/aspeed_smc: Fix incorrect FMC_WDT2 register read on AST1030
pc-bios: Update vbootrom image to commit 183c9ff8056b
roms/Makefile: build ast27x0_bootrom
roms/vbootrom: update to 7b1eb5f7fe6a
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/ssi/aspeed_smc.c | 3 | ||||
| -rw-r--r-- | pc-bios/ast27x0_bootrom.bin | bin | 15552 -> 16408 bytes | |||
| -rw-r--r-- | pc-bios/npcm7xx_bootrom.bin | bin | 768 -> 672 bytes | |||
| -rw-r--r-- | pc-bios/npcm8xx_bootrom.bin | bin | 608 -> 672 bytes | |||
| -rw-r--r-- | roms/Makefile | 5 | ||||
| m--------- | roms/vbootrom | 0 |
6 files changed, 7 insertions, 1 deletions
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 614528b..e33496f 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -1857,7 +1857,8 @@ static void aspeed_1030_fmc_class_init(ObjectClass *klass, const void *data) asc->resets = aspeed_1030_fmc_resets; asc->flash_window_base = 0x80000000; asc->flash_window_size = 0x10000000; - asc->features = ASPEED_SMC_FEATURE_DMA; + asc->features = ASPEED_SMC_FEATURE_DMA | + ASPEED_SMC_FEATURE_WDT_CONTROL; asc->dma_flash_mask = 0x0FFFFFFC; asc->dma_dram_mask = 0x000BFFFC; asc->dma_start_length = 1; diff --git a/pc-bios/ast27x0_bootrom.bin b/pc-bios/ast27x0_bootrom.bin Binary files differindex 0b9b3a2..a4c94d6 100644 --- a/pc-bios/ast27x0_bootrom.bin +++ b/pc-bios/ast27x0_bootrom.bin diff --git a/pc-bios/npcm7xx_bootrom.bin b/pc-bios/npcm7xx_bootrom.bin Binary files differindex 903f126..9228289 100644 --- a/pc-bios/npcm7xx_bootrom.bin +++ b/pc-bios/npcm7xx_bootrom.bin diff --git a/pc-bios/npcm8xx_bootrom.bin b/pc-bios/npcm8xx_bootrom.bin Binary files differindex 6370d64..45fb40f 100644 --- a/pc-bios/npcm8xx_bootrom.bin +++ b/pc-bios/npcm8xx_bootrom.bin diff --git a/roms/Makefile b/roms/Makefile index 6af68a9..4c8793c 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -68,6 +68,7 @@ default help: @echo " u-boot.sam460 -- update u-boot.sam460" @echo " npcm7xx_bootrom -- update vbootrom for npcm7xx" @echo " npcm8xx_bootrom -- update vbootrom for npcm8xx" + @echo " ast27x0_bootrom -- update vbootrom for ast27x0" @echo " efi -- update UEFI (edk2) platform firmware" @echo " opensbi32-generic -- update OpenSBI for 32-bit generic machine" @echo " opensbi64-generic -- update OpenSBI for 64-bit generic machine" @@ -200,6 +201,10 @@ npcm8xx_bootrom: $(MAKE) -C vbootrom/npcm8xx CROSS_COMPILE=$(aarch64_cross_prefix) cp vbootrom/npcm8xx/npcm8xx_bootrom.bin ../pc-bios/npcm8xx_bootrom.bin +ast27x0_bootrom: + $(MAKE) -C vbootrom/ast27x0 CROSS_COMPILE=$(aarch64_cross_prefix) + cp vbootrom/ast27x0/ast27x0_bootrom.bin ../pc-bios/ast27x0_bootrom.bin + hppa-firmware: $(MAKE) -C seabios-hppa parisc cp seabios-hppa/out/hppa-firmware.img ../pc-bios/ diff --git a/roms/vbootrom b/roms/vbootrom -Subproject 1287b6e42e839ba2ab0f06268c5b53ae60df353 +Subproject 183c9ff8056b7946db1ae49cc23e8980ac41317 |