Commit b0457b69 authored by Paul Brook's avatar Paul Brook
Browse files

Fix/remove bogus ram size checks. 



Signed-off-by: default avatarPaul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7087 c046a42c-6fe2-441c-8c8c-71466251a162
parent 520860ef

hw/nseries.c

+0 −7
Original line number Diff line number Diff line
@@ -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

hw/pxa2xx_lcd.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

            }