OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

unbreak ppc/prep

Browse Source 
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>
This commit is contained in:
Gerd Hoffmann 2009-09-14 17:49:24 +02:00 committed by Blue Swirl
parent f80237d450
commit b37fc148bb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/ppc_prep.c
View File

@ -572,7 +572,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
/* init CPUs */ /* init CPUs */
if (cpu_model == NULL) if (cpu_model == NULL)
cpu_model = "default"; cpu_model = "602";
for (i = 0; i < smp_cpus; i++) { for (i = 0; i < smp_cpus; i++) {
env = cpu_init(cpu_model); env = cpu_init(cpu_model);
if (!env) { 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]); i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]);
pci_bus = pci_prep_init(i8259); 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(); // pci_bus = i440fx_init();
/* Register 8 MB of ISA IO space (needed for non-contiguous map) */ /* Register 8 MB of ISA IO space (needed for non-contiguous map) */
PPC_io_memory = cpu_register_io_memory(PPC_prep_io_read, PPC_io_memory = cpu_register_io_memory(PPC_prep_io_read,