c165473269
We set default boot order "cad" in every single machine definition except "pseries" and "moxiesim", even though very few boards actually care for boot order, and "cad" makes sense for even fewer. Machines that care: * pc and its variants Accept up to three letters 'a', 'b' (undocumented alias for 'a'), 'c', 'd' and 'n'. Reject all others (fatal with -boot). * nseries (n800, n810) Check whether order starts with 'n'. Silently ignored otherwise. * prep, g3beige, mac99 Extract the first character the machine understands (subset of 'a'..'f'). Silently ignored otherwise. * spapr Accept an arbitrary string (vl.c restricts it to contain only 'a'..'p', no duplicates). * sun4[mdc] Use the first character. Silently ignored otherwise. Strip characters these machines ignore from their default boot order. For all other machines, remove the unused default boot order alltogether. Note that my rename of QEMUMachine member boot_order to default_boot_order and QEMUMachineInitArgs member boot_device to boot_order has a welcome side effect: it makes every use of boot orders visible in this patch, for easy review. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
73 lines
2.0 KiB
C
73 lines
2.0 KiB
C
/*
|
|
* SA-1110-based Sharp Zaurus SL-5500 platform.
|
|
*
|
|
* Copyright (C) 2011 Dmitry Eremin-Solenikov
|
|
*
|
|
* This code is licensed under GNU GPL v2.
|
|
*
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
|
*/
|
|
#include "hw/hw.h"
|
|
#include "hw/sysbus.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/devices.h"
|
|
#include "strongarm.h"
|
|
#include "hw/arm/arm.h"
|
|
#include "hw/block/flash.h"
|
|
#include "sysemu/blockdev.h"
|
|
#include "exec/address-spaces.h"
|
|
|
|
static struct arm_boot_info collie_binfo = {
|
|
.loader_start = SA_SDCS0,
|
|
.ram_size = 0x20000000,
|
|
};
|
|
|
|
static void collie_init(QEMUMachineInitArgs *args)
|
|
{
|
|
const char *cpu_model = args->cpu_model;
|
|
const char *kernel_filename = args->kernel_filename;
|
|
const char *kernel_cmdline = args->kernel_cmdline;
|
|
const char *initrd_filename = args->initrd_filename;
|
|
StrongARMState *s;
|
|
DriveInfo *dinfo;
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
if (!cpu_model) {
|
|
cpu_model = "sa1110";
|
|
}
|
|
|
|
s = sa1110_init(sysmem, collie_binfo.ram_size, cpu_model);
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 0);
|
|
pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000,
|
|
dinfo ? dinfo->bdrv : NULL, (64 * 1024),
|
|
512, 4, 0x00, 0x00, 0x00, 0x00, 0);
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 1);
|
|
pflash_cfi01_register(SA_CS1, NULL, "collie.fl2", 0x02000000,
|
|
dinfo ? dinfo->bdrv : NULL, (64 * 1024),
|
|
512, 4, 0x00, 0x00, 0x00, 0x00, 0);
|
|
|
|
sysbus_create_simple("scoop", 0x40800000, NULL);
|
|
|
|
collie_binfo.kernel_filename = kernel_filename;
|
|
collie_binfo.kernel_cmdline = kernel_cmdline;
|
|
collie_binfo.initrd_filename = initrd_filename;
|
|
collie_binfo.board_id = 0x208;
|
|
arm_load_kernel(s->cpu, &collie_binfo);
|
|
}
|
|
|
|
static QEMUMachine collie_machine = {
|
|
.name = "collie",
|
|
.desc = "Collie PDA (SA-1110)",
|
|
.init = collie_init,
|
|
};
|
|
|
|
static void collie_machine_init(void)
|
|
{
|
|
qemu_register_machine(&collie_machine);
|
|
}
|
|
|
|
machine_init(collie_machine_init)
|