OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Remove more redundant ram size checks.

Browse Source 
Signed-off-by: Paul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7089 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2009-04-11 17:24:39 +00:00
parent 94a6b54fd6
commit a0b753dfd3
6 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/gumstix.c
View File

@ -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);

8
hw/mainstone.c
View File

@ -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);

6
hw/palm.c
View File

@ -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) */

1
hw/ppc405_boards.c
View File

@ -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

5
hw/spitz.c
View File

@ -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);

6
hw/tosa.c
View File

@ -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";