Revision f1eea068
b/hw/palm.c | ||
---|---|---|
196 | 196 |
const char *initrd_filename, const char *cpu_model) |
197 | 197 |
{ |
198 | 198 |
MemoryRegion *address_space_mem = get_system_memory(); |
199 |
struct omap_mpu_state_s *cpu;
|
|
199 |
struct omap_mpu_state_s *mpu;
|
|
200 | 200 |
int flash_size = 0x00800000; |
201 | 201 |
int sdram_size = palmte_binfo.ram_size; |
202 | 202 |
static uint32_t cs0val = 0xffffffff; |
... | ... | |
208 | 208 |
MemoryRegion *flash = g_new(MemoryRegion, 1); |
209 | 209 |
MemoryRegion *cs = g_new(MemoryRegion, 4); |
210 | 210 |
|
211 |
cpu = omap310_mpu_init(address_space_mem, sdram_size, cpu_model);
|
|
211 |
mpu = omap310_mpu_init(address_space_mem, sdram_size, cpu_model);
|
|
212 | 212 |
|
213 | 213 |
/* External Flash (EMIFS) */ |
214 | 214 |
memory_region_init_ram(flash, "palmte.flash", flash_size); |
... | ... | |
230 | 230 |
OMAP_CS3_SIZE); |
231 | 231 |
memory_region_add_subregion(address_space_mem, OMAP_CS3_BASE, &cs[3]); |
232 | 232 |
|
233 |
palmte_microwire_setup(cpu);
|
|
233 |
palmte_microwire_setup(mpu);
|
|
234 | 234 |
|
235 |
qemu_add_kbd_event_handler(palmte_button_event, cpu);
|
|
235 |
qemu_add_kbd_event_handler(palmte_button_event, mpu);
|
|
236 | 236 |
|
237 |
palmte_gpio_setup(cpu);
|
|
237 |
palmte_gpio_setup(mpu);
|
|
238 | 238 |
|
239 | 239 |
/* Setup initial (reset) machine state */ |
240 | 240 |
if (nb_option_roms) { |
... | ... | |
265 | 265 |
palmte_binfo.kernel_filename = kernel_filename; |
266 | 266 |
palmte_binfo.kernel_cmdline = kernel_cmdline; |
267 | 267 |
palmte_binfo.initrd_filename = initrd_filename; |
268 |
arm_load_kernel(&cpu->cpu->env, &palmte_binfo);
|
|
268 |
arm_load_kernel(&mpu->cpu->env, &palmte_binfo);
|
|
269 | 269 |
} |
270 | 270 |
|
271 | 271 |
/* FIXME: We shouldn't really be doing this here. The LCD controller |
Also available in: Unified diff