Revision b0457b69

b/hw/nseries.c
1272 1272
{
1273 1273
    struct n800_s *s = (struct n800_s *) qemu_mallocz(sizeof(*s));
1274 1274
    int sdram_size = binfo->ram_size;
1275
    int onenandram_size = 0x00010000;
1276 1275
    DisplayState *ds;
1277 1276

  
1278
    if (ram_size < sdram_size + onenandram_size + OMAP242X_SRAM_SIZE) {
1279
        fprintf(stderr, "This architecture uses %i bytes of memory\n",
1280
                        sdram_size + onenandram_size + OMAP242X_SRAM_SIZE);
1281
        exit(1);
1282
    }
1283

  
1284 1277
    s->cpu = omap2420_mpu_init(sdram_size, cpu_model);
1285 1278

  
1286 1279
    /* Setup peripherals
b/hw/pxa2xx_lcd.c
302 302
            descptr = s->dma_ch[i].descriptor;
303 303

  
304 304
        if (!(descptr >= PXA2XX_SDRAM_BASE && descptr +
305
                    sizeof(desc) <= PXA2XX_SDRAM_BASE + phys_ram_size))
305
                    sizeof(desc) <= PXA2XX_SDRAM_BASE + ram_size))
306 306
            continue;
307 307

  
308 308
        cpu_physical_memory_read(descptr, (void *)&desc, sizeof(desc));
......
764 764
            }
765 765
            fbptr = s->dma_ch[ch].source;
766 766
            if (!(fbptr >= PXA2XX_SDRAM_BASE &&
767
                    fbptr <= PXA2XX_SDRAM_BASE + phys_ram_size)) {
767
                    fbptr <= PXA2XX_SDRAM_BASE + ram_size)) {
768 768
                pxa2xx_dma_ber_set(s, ch);
769 769
                continue;
770 770
            }

Also available in: Unified diff