From a0b753dfd3920df146a5f4d05e442e3c522900c7 Mon Sep 17 00:00:00 2001
From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 11 Apr 2009 17:24:39 +0000
Subject: [PATCH] Remove more redundant ram size checks.
Signed-off-by: Paul Brook <paul@codesourcery.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7089 c046a42c-6fe2-441c-8c8c-71466251a162
---
hw/gumstix.c | 12 ------------
hw/mainstone.c | 8 --------
hw/palm.c | 6 ------
hw/ppc405_boards.c | 1 +
hw/spitz.c | 5 -----
hw/tosa.c | 6 ------
6 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 70abbdc27e..87d84b6b92 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -52,12 +52,6 @@ static void connex_init(ram_addr_t ram_size, int vga_ram_size,
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 @@ static void verdex_init(ram_addr_t ram_size, int vga_ram_size,
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);
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 5f4cc91f4c..e5bca4af9b 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -83,14 +83,6 @@ static void mainstone_common_init(ram_addr_t ram_size, int vga_ram_size,
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);
diff --git a/hw/palm.c b/hw/palm.c
index a0c714355e..0b504a9b0a 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -216,12 +216,6 @@ static void palmte_init(ram_addr_t ram_size, int vga_ram_size,
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) */
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index cded197944..df834cd853 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -512,6 +512,7 @@ static void taihu_405ep_init(ram_addr_t ram_size, int vga_ram_size,
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
diff --git a/hw/spitz.c b/hw/spitz.c
index 6a15c78192..852d9b9675 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -919,11 +919,6 @@ static void spitz_common_init(ram_addr_t ram_size, int vga_ram_size,
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);
diff --git a/hw/tosa.c b/hw/tosa.c
index 55042e3515..de308a9d8e 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -205,12 +205,6 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size,
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";
--
2.30.2