diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-11 17:01:42 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-11 17:01:42 +0000 |
| commit | b0457b69209fca3fb40a85bd54d7f27eb4bad7e7 (patch) | |
| tree | 0d4ac28a60ac1570b718877a83638321d1af8223 | |
| parent | 520860ef61705ef8bedb146285d067c1f8b7aabe (diff) | |
| download | qemu-b0457b69209fca3fb40a85bd54d7f27eb4bad7e7.tar.gz qemu-b0457b69209fca3fb40a85bd54d7f27eb4bad7e7.tar.bz2 qemu-b0457b69209fca3fb40a85bd54d7f27eb4bad7e7.zip | |
Fix/remove bogus ram size checks.
Signed-off-by: Paul Brook <paul@codesourcery.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7087 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/nseries.c | 7 | ||||
| -rw-r--r-- | hw/pxa2xx_lcd.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/hw/nseries.c b/hw/nseries.c index b40004ffd6..17bcac6d73 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1272,15 +1272,8 @@ static void n8x0_init(ram_addr_t ram_size, const char *boot_device, { struct n800_s *s = (struct n800_s *) qemu_mallocz(sizeof(*s)); int sdram_size = binfo->ram_size; - int onenandram_size = 0x00010000; DisplayState *ds; - if (ram_size < sdram_size + onenandram_size + OMAP242X_SRAM_SIZE) { - fprintf(stderr, "This architecture uses %i bytes of memory\n", - sdram_size + onenandram_size + OMAP242X_SRAM_SIZE); - exit(1); - } - s->cpu = omap2420_mpu_init(sdram_size, cpu_model); /* Setup peripherals diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c index 4fb7d4f722..2bd0ec0fe0 100644 --- a/hw/pxa2xx_lcd.c +++ b/hw/pxa2xx_lcd.c @@ -302,7 +302,7 @@ static void pxa2xx_descriptor_load(struct pxa2xx_lcdc_s *s) descptr = s->dma_ch[i].descriptor; if (!(descptr >= PXA2XX_SDRAM_BASE && descptr + - sizeof(desc) <= PXA2XX_SDRAM_BASE + phys_ram_size)) + sizeof(desc) <= PXA2XX_SDRAM_BASE + ram_size)) continue; cpu_physical_memory_read(descptr, (void *)&desc, sizeof(desc)); @@ -764,7 +764,7 @@ static void pxa2xx_update_display(void *opaque) } fbptr = s->dma_ch[ch].source; if (!(fbptr >= PXA2XX_SDRAM_BASE && - fbptr <= PXA2XX_SDRAM_BASE + phys_ram_size)) { + fbptr <= PXA2XX_SDRAM_BASE + ram_size)) { pxa2xx_dma_ber_set(s, ch); continue; } |