Commit a0b753dfd3920df146a5f4d05e442e3c522900c7
1 parent
94a6b54f
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
Showing
6 changed files
with
1 additions
and
37 deletions
hw/gumstix.c
@@ -52,12 +52,6 @@ static void connex_init(ram_addr_t ram_size, int vga_ram_size, | @@ -52,12 +52,6 @@ static void connex_init(ram_addr_t ram_size, int vga_ram_size, | ||
52 | uint32_t connex_rom = 0x01000000; | 52 | uint32_t connex_rom = 0x01000000; |
53 | uint32_t connex_ram = 0x04000000; | 53 | uint32_t connex_ram = 0x04000000; |
54 | 54 | ||
55 | - if (ram_size < (connex_ram + connex_rom + PXA2XX_INTERNAL_SIZE)) { | ||
56 | - fprintf(stderr, "This platform requires %i bytes of memory\n", | ||
57 | - connex_ram + connex_rom + PXA2XX_INTERNAL_SIZE); | ||
58 | - exit(1); | ||
59 | - } | ||
60 | - | ||
61 | cpu = pxa255_init(connex_ram); | 55 | cpu = pxa255_init(connex_ram); |
62 | 56 | ||
63 | index = drive_get_index(IF_PFLASH, 0, 0); | 57 | 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, | @@ -92,12 +86,6 @@ static void verdex_init(ram_addr_t ram_size, int vga_ram_size, | ||
92 | uint32_t verdex_rom = 0x02000000; | 86 | uint32_t verdex_rom = 0x02000000; |
93 | uint32_t verdex_ram = 0x10000000; | 87 | uint32_t verdex_ram = 0x10000000; |
94 | 88 | ||
95 | - if (ram_size < (verdex_ram + verdex_rom + PXA2XX_INTERNAL_SIZE)) { | ||
96 | - fprintf(stderr, "This platform requires %i bytes of memory\n", | ||
97 | - verdex_ram + verdex_rom + PXA2XX_INTERNAL_SIZE); | ||
98 | - exit(1); | ||
99 | - } | ||
100 | - | ||
101 | cpu = pxa270_init(verdex_ram, cpu_model ?: "pxa270-c0"); | 89 | cpu = pxa270_init(verdex_ram, cpu_model ?: "pxa270-c0"); |
102 | 90 | ||
103 | index = drive_get_index(IF_PFLASH, 0, 0); | 91 | index = drive_get_index(IF_PFLASH, 0, 0); |
hw/mainstone.c
@@ -83,14 +83,6 @@ static void mainstone_common_init(ram_addr_t ram_size, int vga_ram_size, | @@ -83,14 +83,6 @@ static void mainstone_common_init(ram_addr_t ram_size, int vga_ram_size, | ||
83 | cpu_model = "pxa270-c5"; | 83 | cpu_model = "pxa270-c5"; |
84 | 84 | ||
85 | /* Setup CPU & memory */ | 85 | /* Setup CPU & memory */ |
86 | - if (ram_size < MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH + | ||
87 | - PXA2XX_INTERNAL_SIZE) { | ||
88 | - fprintf(stderr, "This platform requires %i bytes of memory\n", | ||
89 | - MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH + | ||
90 | - PXA2XX_INTERNAL_SIZE); | ||
91 | - exit(1); | ||
92 | - } | ||
93 | - | ||
94 | cpu = pxa270_init(mainstone_binfo.ram_size, cpu_model); | 86 | cpu = pxa270_init(mainstone_binfo.ram_size, cpu_model); |
95 | cpu_register_physical_memory(0, MAINSTONE_ROM, | 87 | cpu_register_physical_memory(0, MAINSTONE_ROM, |
96 | qemu_ram_alloc(MAINSTONE_ROM) | IO_MEM_ROM); | 88 | qemu_ram_alloc(MAINSTONE_ROM) | IO_MEM_ROM); |
hw/palm.c
@@ -216,12 +216,6 @@ static void palmte_init(ram_addr_t ram_size, int vga_ram_size, | @@ -216,12 +216,6 @@ static void palmte_init(ram_addr_t ram_size, int vga_ram_size, | ||
216 | int rom_size, rom_loaded = 0; | 216 | int rom_size, rom_loaded = 0; |
217 | DisplayState *ds = get_displaystate(); | 217 | DisplayState *ds = get_displaystate(); |
218 | 218 | ||
219 | - if (ram_size < flash_size + sdram_size + OMAP15XX_SRAM_SIZE) { | ||
220 | - fprintf(stderr, "This architecture uses %i bytes of memory\n", | ||
221 | - flash_size + sdram_size + OMAP15XX_SRAM_SIZE); | ||
222 | - exit(1); | ||
223 | - } | ||
224 | - | ||
225 | cpu = omap310_mpu_init(sdram_size, cpu_model); | 219 | cpu = omap310_mpu_init(sdram_size, cpu_model); |
226 | 220 | ||
227 | /* External Flash (EMIFS) */ | 221 | /* External Flash (EMIFS) */ |
hw/ppc405_boards.c
@@ -512,6 +512,7 @@ static void taihu_405ep_init(ram_addr_t ram_size, int vga_ram_size, | @@ -512,6 +512,7 @@ static void taihu_405ep_init(ram_addr_t ram_size, int vga_ram_size, | ||
512 | ram_sizes[0] = 0x04000000; | 512 | ram_sizes[0] = 0x04000000; |
513 | ram_bases[1] = qemu_ram_alloc(0x04000000); | 513 | ram_bases[1] = qemu_ram_alloc(0x04000000); |
514 | ram_sizes[1] = 0x04000000; | 514 | ram_sizes[1] = 0x04000000; |
515 | + ram_size = 0x08000000; | ||
515 | #ifdef DEBUG_BOARD_INIT | 516 | #ifdef DEBUG_BOARD_INIT |
516 | printf("%s: register cpu\n", __func__); | 517 | printf("%s: register cpu\n", __func__); |
517 | #endif | 518 | #endif |
hw/spitz.c
@@ -919,11 +919,6 @@ static void spitz_common_init(ram_addr_t ram_size, int vga_ram_size, | @@ -919,11 +919,6 @@ static void spitz_common_init(ram_addr_t ram_size, int vga_ram_size, | ||
919 | cpu_model = (model == terrier) ? "pxa270-c5" : "pxa270-c0"; | 919 | cpu_model = (model == terrier) ? "pxa270-c5" : "pxa270-c0"; |
920 | 920 | ||
921 | /* Setup CPU & memory */ | 921 | /* Setup CPU & memory */ |
922 | - if (ram_size < SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE) { | ||
923 | - fprintf(stderr, "This platform requires %i bytes of memory\n", | ||
924 | - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE); | ||
925 | - exit(1); | ||
926 | - } | ||
927 | cpu = pxa270_init(spitz_binfo.ram_size, cpu_model); | 922 | cpu = pxa270_init(spitz_binfo.ram_size, cpu_model); |
928 | 923 | ||
929 | sl_flash_register(cpu, (model == spitz) ? FLASH_128M : FLASH_1024M); | 924 | sl_flash_register(cpu, (model == spitz) ? FLASH_128M : FLASH_1024M); |
hw/tosa.c
@@ -205,12 +205,6 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size, | @@ -205,12 +205,6 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size, | ||
205 | struct tc6393xb_s *tmio; | 205 | struct tc6393xb_s *tmio; |
206 | struct scoop_info_s *scp0, *scp1; | 206 | struct scoop_info_s *scp0, *scp1; |
207 | 207 | ||
208 | - if (ram_size < (TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + TC6393XB_RAM)) { | ||
209 | - fprintf(stderr, "This platform requires %i bytes of memory\n", | ||
210 | - TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE); | ||
211 | - exit(1); | ||
212 | - } | ||
213 | - | ||
214 | if (!cpu_model) | 208 | if (!cpu_model) |
215 | cpu_model = "pxa255"; | 209 | cpu_model = "pxa255"; |
216 | 210 |