2744ece809
In struct arm_boot_info, kernel_filename, initrd_filename and kernel_cmdline are copied from from MachineState. This patch add MachineState as a parameter into arm_load_dtb() and move the copy chunk of kernel_filename, initrd_filename and kernel_cmdline into arm_load_kernel(). Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Liu Jingqi <jingqi.liu@intel.com> Suggested-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Tao Xu <tao3.xu@intel.com> Message-Id: <20190809065731.9097-2-tao3.xu@intel.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Acked-by: Andrew Jeffery <andrew@aj.id.au> Acked-by: Cédric Le Goater <clg@kaod.org> [ehabkost: include hw/boards.h again to fix build failures] Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
59 lines
1.7 KiB
C
59 lines
1.7 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 "qemu/osdep.h"
|
|
#include "qemu/units.h"
|
|
#include "hw/sysbus.h"
|
|
#include "hw/boards.h"
|
|
#include "strongarm.h"
|
|
#include "hw/arm/boot.h"
|
|
#include "hw/block/flash.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "cpu.h"
|
|
|
|
static struct arm_boot_info collie_binfo = {
|
|
.loader_start = SA_SDCS0,
|
|
.ram_size = 0x20000000,
|
|
};
|
|
|
|
static void collie_init(MachineState *machine)
|
|
{
|
|
StrongARMState *s;
|
|
DriveInfo *dinfo;
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
s = sa1110_init(sysmem, collie_binfo.ram_size, machine->cpu_type);
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 0);
|
|
pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000,
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 1);
|
|
pflash_cfi01_register(SA_CS1, "collie.fl2", 0x02000000,
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);
|
|
|
|
sysbus_create_simple("scoop", 0x40800000, NULL);
|
|
|
|
collie_binfo.board_id = 0x208;
|
|
arm_load_kernel(s->cpu, machine, &collie_binfo);
|
|
}
|
|
|
|
static void collie_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "Sharp SL-5500 (Collie) PDA (SA-1110)";
|
|
mc->init = collie_init;
|
|
mc->ignore_memory_transaction_failures = true;
|
|
mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");
|
|
}
|
|
|
|
DEFINE_MACHINE("collie", collie_machine_init)
|