summaryrefslogtreecommitdiff
path: root/hw/omap2.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-04-14 21:57:44 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-04-14 21:57:44 +0000
commit7e7c5e4c1ba5c9b7efcf1b0c1e34ea150c286e58 (patch)
treed7f37d6f4f29e47f7a5bd67086dbb76aa38f4f7d /hw/omap2.c
parenta5d7eb6534a091566d63f97c8b35c0ac9623d90b (diff)
downloadqemu-7e7c5e4c1ba5c9b7efcf1b0c1e34ea150c286e58.tar.gz
qemu-7e7c5e4c1ba5c9b7efcf1b0c1e34ea150c286e58.tar.bz2
qemu-7e7c5e4c1ba5c9b7efcf1b0c1e34ea150c286e58.zip
Nokia N800 machine support (ARM).
Also add various peripherals: two miscellaneous Nokia CBUS chips, EPSON S1D13745 LCD/TV remote-framebuffer controller, TWL92230 - standard OMAP2 power management companion chip on i2c. Generic OneNAND flash memory, TMP105 temperature sensor on i2c. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4215 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/omap2.c')
-rw-r--r--hw/omap2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/omap2.c b/hw/omap2.c
index 188e0927c0..67e52236c3 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -3496,7 +3496,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size,
{
struct omap_mpu_state_s *s = (struct omap_mpu_state_s *)
qemu_mallocz(sizeof(struct omap_mpu_state_s));
- ram_addr_t sram_base, q3_base;
+ ram_addr_t sram_base, q2_base;
qemu_irq *cpu_irq;
qemu_irq dma_irqs[4];
omap_clk gpio_clks[4];
@@ -3520,7 +3520,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size,
/* Memory-mapped stuff */
cpu_register_physical_memory(OMAP2_Q2_BASE, s->sdram_size,
- (q3_base = qemu_ram_alloc(s->sdram_size)) | IO_MEM_RAM);
+ (q2_base = qemu_ram_alloc(s->sdram_size)) | IO_MEM_RAM);
cpu_register_physical_memory(OMAP2_SRAM_BASE, s->sram_size,
(sram_base = qemu_ram_alloc(s->sram_size)) | IO_MEM_RAM);