Revision 01e0451a hw/lm32_boards.c
b/hw/lm32_boards.c | ||
---|---|---|
28 | 28 |
#include "elf.h" |
29 | 29 |
#include "lm32_hwsetup.h" |
30 | 30 |
#include "lm32.h" |
31 |
#include "exec-memory.h" |
|
32 | 31 |
|
33 | 32 |
typedef struct { |
34 | 33 |
CPUState *env; |
... | ... | |
77 | 76 |
{ |
78 | 77 |
CPUState *env; |
79 | 78 |
DriveInfo *dinfo; |
80 |
MemoryRegion *address_space_mem = get_system_memory(); |
|
81 |
MemoryRegion *phys_ram = g_new(MemoryRegion, 1); |
|
82 |
MemoryRegion *phys_flash = g_new(MemoryRegion, 1); |
|
79 |
ram_addr_t phys_ram; |
|
80 |
ram_addr_t phys_flash; |
|
83 | 81 |
qemu_irq *cpu_irq, irq[32]; |
84 | 82 |
ResetInfo *reset_info; |
85 | 83 |
int i; |
... | ... | |
107 | 105 |
|
108 | 106 |
reset_info->flash_base = flash_base; |
109 | 107 |
|
110 |
memory_region_init_ram(phys_ram, NULL, "lm32_evr.sdram", ram_size);
|
|
111 |
memory_region_add_subregion(address_space_mem, ram_base, phys_ram);
|
|
108 |
phys_ram = qemu_ram_alloc(NULL, "lm32_evr.sdram", ram_size);
|
|
109 |
cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM);
|
|
112 | 110 |
|
113 |
memory_region_init_rom_device(phys_flash, &pflash_cfi02_ops_be, |
|
114 |
NULL, "lm32_evr.flash", flash_size); |
|
111 |
phys_flash = qemu_ram_alloc(NULL, "lm32_evr.flash", flash_size); |
|
115 | 112 |
dinfo = drive_get(IF_PFLASH, 0, 0); |
116 | 113 |
/* Spansion S29NS128P */ |
117 | 114 |
pflash_cfi02_register(flash_base, phys_flash, |
118 | 115 |
dinfo ? dinfo->bdrv : NULL, flash_sector_size, |
119 | 116 |
flash_size / flash_sector_size, 1, 2, |
120 |
0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa); |
|
117 |
0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);
|
|
121 | 118 |
|
122 | 119 |
/* create irq lines */ |
123 | 120 |
cpu_irq = qemu_allocate_irqs(cpu_irq_handler, env, 1); |
... | ... | |
167 | 164 |
{ |
168 | 165 |
CPUState *env; |
169 | 166 |
DriveInfo *dinfo; |
170 |
MemoryRegion *address_space_mem = get_system_memory(); |
|
171 |
MemoryRegion *phys_ram = g_new(MemoryRegion, 1); |
|
172 |
MemoryRegion *phys_flash = g_new(MemoryRegion, 1); |
|
167 |
ram_addr_t phys_ram; |
|
168 |
ram_addr_t phys_flash; |
|
173 | 169 |
qemu_irq *cpu_irq, irq[32]; |
174 | 170 |
HWSetup *hw; |
175 | 171 |
ResetInfo *reset_info; |
... | ... | |
204 | 200 |
|
205 | 201 |
reset_info->flash_base = flash_base; |
206 | 202 |
|
207 |
memory_region_init_ram(phys_ram, NULL, "lm32_uclinux.sdram", ram_size);
|
|
208 |
memory_region_add_subregion(address_space_mem, ram_base, phys_ram);
|
|
203 |
phys_ram = qemu_ram_alloc(NULL, "lm32_uclinux.sdram", ram_size);
|
|
204 |
cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM);
|
|
209 | 205 |
|
210 |
memory_region_init_rom_device(phys_flash, &pflash_cfi01_ops_be, |
|
211 |
NULL, "lm32_uclinux.flash", flash_size); |
|
206 |
phys_flash = qemu_ram_alloc(NULL, "lm32_uclinux.flash", flash_size); |
|
212 | 207 |
dinfo = drive_get(IF_PFLASH, 0, 0); |
213 | 208 |
/* Spansion S29NS128P */ |
214 | 209 |
pflash_cfi02_register(flash_base, phys_flash, |
215 | 210 |
dinfo ? dinfo->bdrv : NULL, flash_sector_size, |
216 | 211 |
flash_size / flash_sector_size, 1, 2, |
217 |
0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa); |
|
212 |
0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);
|
|
218 | 213 |
|
219 | 214 |
/* create irq lines */ |
220 | 215 |
cpu_irq = qemu_allocate_irqs(cpu_irq_handler, env, 1); |
Also available in: Unified diff