diff options
| -rw-r--r-- | hw/arm-misc.h | 1 | ||||
| -rw-r--r-- | hw/integratorcp.c | 2 | ||||
| -rw-r--r-- | hw/realview.c | 17 | ||||
| -rw-r--r-- | hw/versatilepb.c | 4 |
4 files changed, 15 insertions, 9 deletions
diff --git a/hw/arm-misc.h b/hw/arm-misc.h index a6991975fc..5daac4fabf 100644 --- a/hw/arm-misc.h +++ b/hw/arm-misc.h @@ -27,6 +27,7 @@ struct arm_boot_info { const char *kernel_cmdline; const char *initrd_filename; target_phys_addr_t loader_start; + target_phys_addr_t smp_loader_start; int nb_cpus; int board_id; int (*atag_board)(struct arm_boot_info *info, void *p); diff --git a/hw/integratorcp.c b/hw/integratorcp.c index f990afed7a..8f2ff2da60 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -457,7 +457,7 @@ static void integratorcp_init(ram_addr_t ram_size, int vga_ram_size, const char *initrd_filename, const char *cpu_model) { CPUState *env; - uint32_t ram_offset; + ram_addr_t ram_offset; qemu_irq *pic; qemu_irq *cpu_pic; int sd; diff --git a/hw/realview.c b/hw/realview.c index aae4b86c25..a930a46b10 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -29,6 +29,7 @@ static void realview_init(ram_addr_t ram_size, int vga_ram_size, const char *initrd_filename, const char *cpu_model) { CPUState *env; + ram_addr_t ram_offset; qemu_irq *pic; void *scsi_hba; PCIBus *pci_bus; @@ -64,9 +65,10 @@ static void realview_init(ram_addr_t ram_size, int vga_ram_size, } } + ram_offset = qemu_ram_alloc(ram_size); /* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero. */ - cpu_register_physical_memory(0, ram_size, IO_MEM_RAM); + cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM); arm_sysctl_init(0x10000000, 0xc1400400); @@ -182,18 +184,19 @@ static void realview_init(ram_addr_t ram_size, int vga_ram_size, /* 0x68000000 PCI mem 1. */ /* 0x6c000000 PCI mem 2. */ + /* ??? Hack to map an additional page of ram for the secondary CPU + startup code. I guess this works on real hardware because the + BootROM happens to be in ROM/flash or in memory that isn't clobbered + until after Linux boots the secondary CPUs. */ + ram_offset = qemu_ram_alloc(0x1000); + cpu_register_physical_memory(0x80000000, 0x1000, ram_offset | IO_MEM_RAM); + realview_binfo.ram_size = ram_size; realview_binfo.kernel_filename = kernel_filename; realview_binfo.kernel_cmdline = kernel_cmdline; realview_binfo.initrd_filename = initrd_filename; realview_binfo.nb_cpus = ncpu; arm_load_kernel(first_cpu, &realview_binfo); - - /* ??? Hack to map an additional page of ram for the secondary CPU - startup code. I guess this works on real hardware because the - BootROM happens to be in ROM/flash or in memory that isn't clobbered - until after Linux boots the secondary CPUs. */ - cpu_register_physical_memory(0x80000000, 0x1000, IO_MEM_RAM + ram_size); } QEMUMachine realview_machine = { diff --git a/hw/versatilepb.c b/hw/versatilepb.c index d80e2f2741..c018a06f8a 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -160,6 +160,7 @@ static void versatile_init(ram_addr_t ram_size, int vga_ram_size, int board_id) { CPUState *env; + ram_addr_t ram_offset; qemu_irq *pic; qemu_irq *sic; void *scsi_hba; @@ -176,9 +177,10 @@ static void versatile_init(ram_addr_t ram_size, int vga_ram_size, fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } + ram_offset = qemu_ram_alloc(ram_size); /* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero. */ - cpu_register_physical_memory(0, ram_size, IO_MEM_RAM); + cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM); arm_sysctl_init(0x10000000, 0x41007004); pic = arm_pic_init_cpu(env); |