diff options
| -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 614528b8ef..e33496f502 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 index 0b9b3a2360..a4c94d64da 100644 --- a/pc-bios/ast27x0_bootrom.bin +++ b/pc-bios/ast27x0_bootrom.bin Binary files differdiff --git a/pc-bios/npcm7xx_bootrom.bin b/pc-bios/npcm7xx_bootrom.bin index 903f126636..92282892b7 100644 --- a/pc-bios/npcm7xx_bootrom.bin +++ b/pc-bios/npcm7xx_bootrom.bin Binary files differdiff --git a/pc-bios/npcm8xx_bootrom.bin b/pc-bios/npcm8xx_bootrom.bin index 6370d64756..45fb40fb59 100644 --- a/pc-bios/npcm8xx_bootrom.bin +++ b/pc-bios/npcm8xx_bootrom.bin Binary files differdiff --git a/roms/Makefile b/roms/Makefile index 6af68a922f..4c8793c5bd 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 |