diff options
| author | Alexander Graf <agraf@suse.de> | 2011-09-30 15:29:12 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-01 06:45:35 +0000 |
| commit | b39491a83d0b9d573d5fd21163f61f66a11b54b9 (patch) | |
| tree | 802c8dad3fd68134af5fce9eab7d30031fd4b8bf /hw | |
| parent | a4773324b4bc5f15fe9b438e4cfff05e1ab16dfa (diff) | |
| download | qemu-b39491a83d0b9d573d5fd21163f61f66a11b54b9.tar.gz | |
PPC: Drop initial ESCC mapping
We are mapping ESCC to a static (incorrect) address on machine init. This
overlaps with our vram, rendering the screen barely usable.
Since openBIOS is clever enough to map ESCC to where it needs to be, we can
just drop that invalid map and everyone's happy.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc_newworld.c | 2 | ||||
| -rw-r--r-- | hw/ppc_oldworld.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 69718cfcdd..b1cc3d70a7 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -325,7 +325,7 @@ static void ppc_core99_init (ram_addr_t ram_size, /* init basic PC hardware */ pci_vga_init(pci_bus); - escc_mem = escc_init(0x80013000, pic[0x25], pic[0x24], + escc_mem = escc_init(0, pic[0x25], pic[0x24], serial_hds[0], serial_hds[1], ESCC_CLOCK, 4); memory_region_init_alias(escc_bar, "escc-bar", escc_mem, 0, memory_region_size(escc_mem)); diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index e127d21d58..fa2c1e7768 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -237,7 +237,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, get_system_io()); pci_vga_init(pci_bus); - escc_mem = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0], + escc_mem = escc_init(0, pic[0x0f], pic[0x10], serial_hds[0], serial_hds[1], ESCC_CLOCK, 4); memory_region_init_alias(escc_bar, "escc-bar", escc_mem, 0, memory_region_size(escc_mem)); |