malta: Always allocate flash memory
There is no reason why there should not be a flash memory when the Malta emulation is started with a Linux kernel. When flash memory is always available, the code is simpler, and it can be better tested. Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
parent
82a9807bca
commit
bb4b335871
|
@ -777,7 +777,7 @@ void mips_malta_init (ram_addr_t ram_size,
|
|||
MemoryRegion *system_memory = get_system_memory();
|
||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
||||
MemoryRegion *bios, *bios_alias = g_new(MemoryRegion, 1);
|
||||
target_long bios_size;
|
||||
target_long bios_size = 0x400000;
|
||||
int64_t kernel_entry;
|
||||
PCIBus *pci_bus;
|
||||
ISABus *isa_bus;
|
||||
|
@ -791,7 +791,7 @@ void mips_malta_init (ram_addr_t ram_size,
|
|||
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
|
||||
DriveInfo *fd[MAX_FD];
|
||||
int fl_idx = 0;
|
||||
int fl_sectors = 0;
|
||||
int fl_sectors = bios_size >> 16;
|
||||
int be;
|
||||
|
||||
DeviceState *dev = qdev_create(NULL, "mips-malta");
|
||||
|
@ -849,14 +849,24 @@ void mips_malta_init (ram_addr_t ram_size,
|
|||
/* FPGA */
|
||||
malta_fpga_init(system_memory, 0x1f000000LL, env->irq[2], serial_hds[2]);
|
||||
|
||||
/* Load firmware in flash / BIOS unless we boot directly into a kernel. */
|
||||
/* Load firmware in flash / BIOS. */
|
||||
dinfo = drive_get(IF_PFLASH, 0, fl_idx);
|
||||
#ifdef DEBUG_BOARD_INIT
|
||||
if (dinfo) {
|
||||
printf("Register parallel flash %d size " TARGET_FMT_lx " at "
|
||||
"addr %08llx '%s' %x\n",
|
||||
fl_idx, bios_size, 0x1e000000LL,
|
||||
bdrv_get_device_name(dinfo->bdrv), fl_sectors);
|
||||
}
|
||||
#endif
|
||||
fl = pflash_cfi01_register(0x1e000000LL, NULL, "mips_malta.bios",
|
||||
BIOS_SIZE, dinfo ? dinfo->bdrv : NULL,
|
||||
65536, fl_sectors,
|
||||
4, 0x0000, 0x0000, 0x0000, 0x0000, be);
|
||||
bios = pflash_cfi01_get_memory(fl);
|
||||
fl_idx++;
|
||||
if (kernel_filename) {
|
||||
/* Write a small bootloader to the flash location. */
|
||||
bios = g_new(MemoryRegion, 1);
|
||||
memory_region_init_ram(bios, "mips_malta.bios", BIOS_SIZE);
|
||||
vmstate_register_ram_global(bios);
|
||||
memory_region_set_readonly(bios, true);
|
||||
memory_region_add_subregion(system_memory, 0x1e000000LL, bios);
|
||||
loaderparams.ram_size = ram_size;
|
||||
loaderparams.kernel_filename = kernel_filename;
|
||||
loaderparams.kernel_cmdline = kernel_cmdline;
|
||||
|
@ -864,32 +874,12 @@ void mips_malta_init (ram_addr_t ram_size,
|
|||
kernel_entry = load_kernel();
|
||||
write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry);
|
||||
} else {
|
||||
dinfo = drive_get(IF_PFLASH, 0, fl_idx);
|
||||
if (dinfo) {
|
||||
/* Load firmware from flash. */
|
||||
bios_size = 0x400000;
|
||||
fl_sectors = bios_size >> 16;
|
||||
#ifdef DEBUG_BOARD_INIT
|
||||
printf("Register parallel flash %d size " TARGET_FMT_lx " at "
|
||||
"addr %08llx '%s' %x\n",
|
||||
fl_idx, bios_size, 0x1e000000LL,
|
||||
bdrv_get_device_name(dinfo->bdrv), fl_sectors);
|
||||
#endif
|
||||
fl = pflash_cfi01_register(0x1e000000LL,
|
||||
NULL, "mips_malta.bios", BIOS_SIZE,
|
||||
dinfo->bdrv, 65536, fl_sectors,
|
||||
4, 0x0000, 0x0000, 0x0000, 0x0000, be);
|
||||
bios = pflash_cfi01_get_memory(fl);
|
||||
fl_idx++;
|
||||
} else {
|
||||
bios = g_new(MemoryRegion, 1);
|
||||
memory_region_init_ram(bios, "mips_malta.bios", BIOS_SIZE);
|
||||
vmstate_register_ram_global(bios);
|
||||
memory_region_set_readonly(bios, true);
|
||||
memory_region_add_subregion(system_memory, 0x1e000000LL, bios);
|
||||
if (!dinfo) {
|
||||
/* Load a BIOS image. */
|
||||
if (bios_name == NULL)
|
||||
if (bios_name == NULL) {
|
||||
bios_name = BIOS_FILENAME;
|
||||
}
|
||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
||||
if (filename) {
|
||||
bios_size = load_image_targphys(filename, 0x1e000000LL,
|
||||
|
|
Loading…
Reference in a new issue