[Qemu-devel] [7089] Remove more redundant ram size checks.

[Paul Brook]

Revision: 7089
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7089
Author:   pbrook
Date:     2009-04-11 17:24:39 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
Remove more redundant ram size checks.

Signed-off-by: Paul Brook <address@hidden>

Modified Paths:
--------------
    trunk/hw/gumstix.c
    trunk/hw/mainstone.c
    trunk/hw/palm.c
    trunk/hw/ppc405_boards.c
    trunk/hw/spitz.c
    trunk/hw/tosa.c

Modified: trunk/hw/gumstix.c
===================================================================
--- trunk/hw/gumstix.c  2009-04-11 17:15:54 UTC (rev 7088)
+++ trunk/hw/gumstix.c  2009-04-11 17:24:39 UTC (rev 7089)
@@ -52,12 +52,6 @@
     uint32_t connex_rom = 0x01000000;
     uint32_t connex_ram = 0x04000000;
 
-    if (ram_size < (connex_ram + connex_rom + PXA2XX_INTERNAL_SIZE)) {
-        fprintf(stderr, "This platform requires %i bytes of memory\n",
-                connex_ram + connex_rom + PXA2XX_INTERNAL_SIZE);
-        exit(1);
-    }
-
     cpu = pxa255_init(connex_ram);
 
     index = drive_get_index(IF_PFLASH, 0, 0);
@@ -92,12 +86,6 @@
     uint32_t verdex_rom = 0x02000000;
     uint32_t verdex_ram = 0x10000000;
 
-    if (ram_size < (verdex_ram + verdex_rom + PXA2XX_INTERNAL_SIZE)) {
-        fprintf(stderr, "This platform requires %i bytes of memory\n",
-                verdex_ram + verdex_rom + PXA2XX_INTERNAL_SIZE);
-        exit(1);
-    }
-
     cpu = pxa270_init(verdex_ram, cpu_model ?: "pxa270-c0");
 
     index = drive_get_index(IF_PFLASH, 0, 0);

Modified: trunk/hw/mainstone.c
===================================================================
--- trunk/hw/mainstone.c        2009-04-11 17:15:54 UTC (rev 7088)
+++ trunk/hw/mainstone.c        2009-04-11 17:24:39 UTC (rev 7089)
@@ -83,14 +83,6 @@
         cpu_model = "pxa270-c5";
 
     /* Setup CPU & memory */
-    if (ram_size < MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH +
-                    PXA2XX_INTERNAL_SIZE) {
-        fprintf(stderr, "This platform requires %i bytes of memory\n",
-                        MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH +
-                        PXA2XX_INTERNAL_SIZE);
-        exit(1);
-    }
-
     cpu = pxa270_init(mainstone_binfo.ram_size, cpu_model);
     cpu_register_physical_memory(0, MAINSTONE_ROM,
                     qemu_ram_alloc(MAINSTONE_ROM) | IO_MEM_ROM);

Modified: trunk/hw/palm.c
===================================================================
--- trunk/hw/palm.c     2009-04-11 17:15:54 UTC (rev 7088)
+++ trunk/hw/palm.c     2009-04-11 17:24:39 UTC (rev 7089)
@@ -216,12 +216,6 @@
     int rom_size, rom_loaded = 0;
     DisplayState *ds = get_displaystate();
 
-    if (ram_size < flash_size + sdram_size + OMAP15XX_SRAM_SIZE) {
-        fprintf(stderr, "This architecture uses %i bytes of memory\n",
-                        flash_size + sdram_size + OMAP15XX_SRAM_SIZE);
-        exit(1);
-    }
-
     cpu = omap310_mpu_init(sdram_size, cpu_model);
 
     /* External Flash (EMIFS) */

Modified: trunk/hw/ppc405_boards.c
===================================================================
--- trunk/hw/ppc405_boards.c    2009-04-11 17:15:54 UTC (rev 7088)
+++ trunk/hw/ppc405_boards.c    2009-04-11 17:24:39 UTC (rev 7089)
@@ -512,6 +512,7 @@
     ram_sizes[0] = 0x04000000;
     ram_bases[1] = qemu_ram_alloc(0x04000000);
     ram_sizes[1] = 0x04000000;
+    ram_size = 0x08000000;
 #ifdef DEBUG_BOARD_INIT
     printf("%s: register cpu\n", __func__);
 #endif

Modified: trunk/hw/spitz.c
===================================================================
--- trunk/hw/spitz.c    2009-04-11 17:15:54 UTC (rev 7088)
+++ trunk/hw/spitz.c    2009-04-11 17:24:39 UTC (rev 7089)
@@ -919,11 +919,6 @@
         cpu_model = (model == terrier) ? "pxa270-c5" : "pxa270-c0";
 
     /* Setup CPU & memory */
-    if (ram_size < SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE) {
-        fprintf(stderr, "This platform requires %i bytes of memory\n",
-                        SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE);
-        exit(1);
-    }
     cpu = pxa270_init(spitz_binfo.ram_size, cpu_model);
 
     sl_flash_register(cpu, (model == spitz) ? FLASH_128M : FLASH_1024M);

Modified: trunk/hw/tosa.c
===================================================================
--- trunk/hw/tosa.c     2009-04-11 17:15:54 UTC (rev 7088)
+++ trunk/hw/tosa.c     2009-04-11 17:24:39 UTC (rev 7089)
@@ -205,12 +205,6 @@
     struct tc6393xb_s *tmio;
     struct scoop_info_s *scp0, *scp1;
 
-    if (ram_size < (TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + 
TC6393XB_RAM)) {
-        fprintf(stderr, "This platform requires %i bytes of memory\n",
-                TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE);
-        exit(1);
-    }
-
     if (!cpu_model)
         cpu_model = "pxa255";