collie.c (ef475b5dd12684591e6264e517eaa5b3e90f7ffa) collie.c (ba1ba5cca3962a9cc400c713c736b4fb8db1f38e)
1/*
2 * SA-1110-based Sharp Zaurus SL-5500 platform.
3 *
4 * Copyright (C) 2011 Dmitry Eremin-Solenikov
5 *
6 * This code is licensed under GNU GPL v2.
7 *
8 * Contributions after 2012-01-13 are licensed under the terms of the

--- 4 unchanged lines hidden (view full) ---

13#include "hw/sysbus.h"
14#include "hw/boards.h"
15#include "hw/devices.h"
16#include "strongarm.h"
17#include "hw/arm/arm.h"
18#include "hw/block/flash.h"
19#include "sysemu/block-backend.h"
20#include "exec/address-spaces.h"
1/*
2 * SA-1110-based Sharp Zaurus SL-5500 platform.
3 *
4 * Copyright (C) 2011 Dmitry Eremin-Solenikov
5 *
6 * This code is licensed under GNU GPL v2.
7 *
8 * Contributions after 2012-01-13 are licensed under the terms of the

--- 4 unchanged lines hidden (view full) ---

13#include "hw/sysbus.h"
14#include "hw/boards.h"
15#include "hw/devices.h"
16#include "strongarm.h"
17#include "hw/arm/arm.h"
18#include "hw/block/flash.h"
19#include "sysemu/block-backend.h"
20#include "exec/address-spaces.h"
21#include "qom/cpu.h"
21#include "cpu.h"
22
23static struct arm_boot_info collie_binfo = {
24 .loader_start = SA_SDCS0,
25 .ram_size = 0x20000000,
26};
27
28static void collie_init(MachineState *machine)
29{
22
23static struct arm_boot_info collie_binfo = {
24 .loader_start = SA_SDCS0,
25 .ram_size = 0x20000000,
26};
27
28static void collie_init(MachineState *machine)
29{
30 const char *cpu_model = machine->cpu_model;
31 const char *kernel_filename = machine->kernel_filename;
32 const char *kernel_cmdline = machine->kernel_cmdline;
33 const char *initrd_filename = machine->initrd_filename;
34 StrongARMState *s;
35 DriveInfo *dinfo;
36 MemoryRegion *sysmem = get_system_memory();
37
30 const char *kernel_filename = machine->kernel_filename;
31 const char *kernel_cmdline = machine->kernel_cmdline;
32 const char *initrd_filename = machine->initrd_filename;
33 StrongARMState *s;
34 DriveInfo *dinfo;
35 MemoryRegion *sysmem = get_system_memory();
36
38 if (!cpu_model) {
39 cpu_model = "sa1110";
40 }
37 s = sa1110_init(sysmem, collie_binfo.ram_size, machine->cpu_type);
41
38
42 s = sa1110_init(sysmem, collie_binfo.ram_size, cpu_model);
43
44 dinfo = drive_get(IF_PFLASH, 0, 0);
45 pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000,
46 dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
47 (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);
48
49 dinfo = drive_get(IF_PFLASH, 0, 1);
50 pflash_cfi01_register(SA_CS1, NULL, "collie.fl2", 0x02000000,
51 dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

--- 8 unchanged lines hidden (view full) ---

60 arm_load_kernel(s->cpu, &collie_binfo);
61}
62
63static void collie_machine_init(MachineClass *mc)
64{
65 mc->desc = "Sharp SL-5500 (Collie) PDA (SA-1110)";
66 mc->init = collie_init;
67 mc->ignore_memory_transaction_failures = true;
39 dinfo = drive_get(IF_PFLASH, 0, 0);
40 pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000,
41 dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
42 (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);
43
44 dinfo = drive_get(IF_PFLASH, 0, 1);
45 pflash_cfi01_register(SA_CS1, NULL, "collie.fl2", 0x02000000,
46 dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

--- 8 unchanged lines hidden (view full) ---

55 arm_load_kernel(s->cpu, &collie_binfo);
56}
57
58static void collie_machine_init(MachineClass *mc)
59{
60 mc->desc = "Sharp SL-5500 (Collie) PDA (SA-1110)";
61 mc->init = collie_init;
62 mc->ignore_memory_transaction_failures = true;
63 mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");
68}
69
70DEFINE_MACHINE("collie", collie_machine_init)
64}
65
66DEFINE_MACHINE("collie", collie_machine_init)