diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-28 11:19:48 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-28 11:19:48 +0000 |
| commit | c12d4b60be782d86faefcc22dc62632b8a3e449e (patch) | |
| tree | 2cf49631815eb65ef18bc542ea07214ab647b20b /hw/mips/mips_fulong2e.c | |
| parent | 4ae046b8314de2245218032c8b234c6fdb50478d (diff) | |
| parent | 0484d9d4fbe9beacd3dd36fdf7fc3e14940bf078 (diff) | |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-feb-27-2020' into staging
MIPS queue for February 27th, 2020
# gpg: Signature made Thu 27 Feb 2020 13:20:55 GMT
# gpg: using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [full]
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65
* remotes/amarkovic/tags/mips-queue-feb-27-2020:
tests/acceptance: Count multiple Tux logos displayed on framebuffer
hw/mips: Use memory_region_init_rom() with read-only regions
hw/mips/mips_int: Simplify cpu_mips_irq_init_cpu()
MAINTAINERS: Reactivate MIPS KVM CPUs
MAINTAINERS: Orphan MIPS KVM CPUs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/mips/mips_fulong2e.c')
| -rw-r--r-- | hw/mips/mips_fulong2e.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index c373ab066b..4727b1d3a4 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -319,9 +319,8 @@ static void mips_fulong2e_init(MachineState *machine) } /* allocate RAM */ - memory_region_init_ram(bios, NULL, "fulong2e.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "fulong2e.bios", BIOS_SIZE, &error_fatal); - memory_region_set_readonly(bios, true); memory_region_add_subregion(address_space_mem, 0, machine->ram); memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); |