diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-09-14 17:49:24 +0200 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2009-09-14 16:40:43 +0000 |
commit | b37fc148bb81b5b022846156a6cba266e6c23962 (patch) | |
tree | b59f90289dcb642bb2019a83a12e1e2b73f0fa02 | |
parent | f80237d45032fbc429aba3b597175fb544a11378 (diff) |
unbreak ppc/prep
Changes:
* added isa bus, hooked up to the system bus. Not sure this is correct,
but 'info pci' lists lists no pci-isa bridge in the machine ...).
* switches the default cpu to one which actually works.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r-- | hw/ppc_prep.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 19301467fa..743dad2b77 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -572,7 +572,7 @@ static void ppc_prep_init (ram_addr_t ram_size, /* init CPUs */ if (cpu_model == NULL) - cpu_model = "default"; + cpu_model = "602"; for (i = 0; i < smp_cpus; i++) { env = cpu_init(cpu_model); if (!env) { @@ -670,6 +670,9 @@ static void ppc_prep_init (ram_addr_t ram_size, } i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]); pci_bus = pci_prep_init(i8259); + /* Hmm, prep has no pci-isa bridge ??? */ + isa_bus_new(NULL); + isa_bus_irqs(i8259); // pci_bus = i440fx_init(); /* Register 8 MB of ISA IO space (needed for non-contiguous map) */ PPC_io_memory = cpu_register_io_memory(PPC_prep_io_read, |