Commit 88fa8031 authored by Avi Kivity's avatar Avi Kivity
Browse files

lm32_boards: convert to memory API 



Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent cbdea0ca

hw/lm32_boards.c

+9 −6
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "elf.h"

#include "lm32_hwsetup.h"

#include "lm32.h"

#include "exec-memory.h"



typedef struct {

    CPUState *env;
@@ -76,7 +77,8 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used, 
{

    CPUState *env;

    DriveInfo *dinfo;

    ram_addr_t phys_ram;

    MemoryRegion *address_space_mem =  get_system_memory();

    MemoryRegion *phys_ram = g_new(MemoryRegion, 1);

    qemu_irq *cpu_irq, irq[32];

    ResetInfo *reset_info;

    int i;
@@ -104,8 +106,8 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used, 


    reset_info->flash_base = flash_base;



    phys_ram = qemu_ram_alloc(NULL, "lm32_evr.sdram", ram_size);

    cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM);

    memory_region_init_ram(phys_ram, NULL, "lm32_evr.sdram", ram_size);

    memory_region_add_subregion(address_space_mem, ram_base, phys_ram);



    dinfo = drive_get(IF_PFLASH, 0, 0);

    /* Spansion S29NS128P */
@@ -162,7 +164,8 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not_used, 
{

    CPUState *env;

    DriveInfo *dinfo;

    ram_addr_t phys_ram;

    MemoryRegion *address_space_mem =  get_system_memory();

    MemoryRegion *phys_ram = g_new(MemoryRegion, 1);

    qemu_irq *cpu_irq, irq[32];

    HWSetup *hw;

    ResetInfo *reset_info;
@@ -197,8 +200,8 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not_used, 


    reset_info->flash_base = flash_base;



    phys_ram = qemu_ram_alloc(NULL, "lm32_uclinux.sdram", ram_size);

    cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM);

    memory_region_init_ram(phys_ram, NULL, "lm32_uclinux.sdram", ram_size);

    memory_region_add_subregion(address_space_mem, ram_base, phys_ram);



    dinfo = drive_get(IF_PFLASH, 0, 0);

    /* Spansion S29NS128P */