ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memory allocation on mainstone2 and convert to qemu_ram_alloc. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3889 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-01-05 19:29:17 +00:00
parent d66846a14e
commit 6d1f177831
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -19,7 +19,7 @@
- OMAP310 MPU emulation plus Palm T|E machine (Andrzej Zaborowski) - OMAP310 MPU emulation plus Palm T|E machine (Andrzej Zaborowski)
- ARM v6, v7, NEON SIMD and SMP emulation (Paul Brook/CodeSourcery) - ARM v6, v7, NEON SIMD and SMP emulation (Paul Brook/CodeSourcery)
- Gumstix boards: connex and verdex emulation (Thorsten Zitterell) - Gumstix boards: connex and verdex emulation (Thorsten Zitterell)
- Intel mainstone board emulation (Armin Kuster) - Intel mainstone II board emulation (Armin Kuster)
- VMware SVGA II graphics card support (Andrzej Zaborowski) - VMware SVGA II graphics card support (Andrzej Zaborowski)
version 0.9.0: version 0.9.0:

36
hw/mainstone.c
View File

@ -66,17 +66,22 @@ static void mainstone_common_init(int ram_size, int vga_ram_size,
{ {
uint32_t mainstone_ram = 0x04000000; uint32_t mainstone_ram = 0x04000000;
uint32_t mainstone_rom = 0x00800000; uint32_t mainstone_rom = 0x00800000;
uint32_t mainstone_flash = 0x02000000;
uint32_t sector_len = 256 * 1024;
target_phys_addr_t mainstone_flash_base[] = { MST_FLASH_0, MST_FLASH_1 };
struct pxa2xx_state_s *cpu; struct pxa2xx_state_s *cpu;
qemu_irq *mst_irq; qemu_irq *mst_irq;
int index; int i, index;
if (!cpu_model) if (!cpu_model)
cpu_model = "pxa270-c5"; cpu_model = "pxa270-c5";
/* Setup CPU & memory */ /* Setup CPU & memory */
if (ram_size < mainstone_ram + mainstone_rom + PXA2XX_INTERNAL_SIZE) { if (ram_size < mainstone_ram + mainstone_rom + 2 * mainstone_flash +
PXA2XX_INTERNAL_SIZE) {
fprintf(stderr, "This platform requires %i bytes of memory\n", fprintf(stderr, "This platform requires %i bytes of memory\n",
mainstone_ram + mainstone_rom + PXA2XX_INTERNAL_SIZE); mainstone_ram + mainstone_rom + 2 * mainstone_flash +
PXA2XX_INTERNAL_SIZE);
exit(1); exit(1);
} }
@ -88,33 +93,22 @@ static void mainstone_common_init(int ram_size, int vga_ram_size,
cpu->env->regs[15] = PXA2XX_SDRAM_BASE; cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
/* There are two 32MiB flash devices on the board */ /* There are two 32MiB flash devices on the board */
index = drive_get_index(IF_PFLASH, 0, 0); for (i = 0; i < 2; i ++) {
index = drive_get_index(IF_PFLASH, 0, i);
if (index == -1) { if (index == -1) {
fprintf(stderr, "Two flash images must be given with the " fprintf(stderr, "Two flash images must be given with the "
"'pflash' parameter\n"); "'pflash' parameter\n");
exit(1); exit(1);
} }
if (!pflash_cfi01_register(MST_FLASH_0,
mainstone_ram + PXA2XX_INTERNAL_SIZE,
drives_table[index].bdrv,
256 * 1024, 128, 4, 0, 0, 0, 0)) {
fprintf(stderr, "qemu: Error registering flash memory.\n");
exit(1);
}
index = drive_get_index(IF_PFLASH, 0, 1); if (!pflash_cfi01_register(mainstone_flash_base[i],
if (index == -1) { qemu_ram_alloc(mainstone_flash),
fprintf(stderr, "Two flash images must be given with the " drives_table[index].bdrv, sector_len,
"'pflash' parameter\n"); mainstone_flash / sector_len, 4, 0, 0, 0, 0)) {
exit(1);
}
if (!pflash_cfi01_register(MST_FLASH_1,
mainstone_ram + PXA2XX_INTERNAL_SIZE,
drives_table[index].bdrv,
256 * 1024, 128, 4, 0, 0, 0, 0)) {
fprintf(stderr, "qemu: Error registering flash memory.\n"); fprintf(stderr, "qemu: Error registering flash memory.\n");
exit(1); exit(1);
} }
}
mst_irq = mst_irq_init(cpu, MST_FPGA_PHYS, PXA2XX_PIC_GPIO_0); mst_irq = mst_irq_init(cpu, MST_FPGA_PHYS, PXA2XX_PIC_GPIO_0);