49
Exynos4210State soc;
50
MemoryRegion dram0_mem;
51
MemoryRegion dram1_mem;
52
+ struct arm_boot_info bootinfo;
53
} Exynos4BoardState;
54
55
static int exynos4_board_id[EXYNOS4_NUM_OF_BOARDS] = {
67
[EXYNOS4_BOARD_SMDKC210] = 1 * GiB,
68
};
69
69
-static struct arm_boot_info exynos4_board_binfo = {
70
- .loader_start = EXYNOS4210_BASE_BOOT_ADDR,
71
- .smp_loader_start = EXYNOS4210_SMP_BOOT_ADDR,
72
- .write_secondary_boot = exynos4210_write_secondary,
73
-};
74
-
70
static void lan9215_init(uint32_t base, qemu_irq irq)
71
{
72
DeviceState *dev;
108
exynos4_boards_init_common(MachineState *machine,
109
Exynos4BoardType board_type)
110
{
116
- Exynos4BoardState *s = g_new(Exynos4BoardState, 1);
111
+ Exynos4BoardState *s = g_new0(Exynos4BoardState, 1);
112
118
- exynos4_board_binfo.ram_size = exynos4_board_ram_size[board_type];
119
- exynos4_board_binfo.board_id = exynos4_board_id[board_type];
120
- exynos4_board_binfo.smp_bootreg_addr =
121
- exynos4_board_smp_bootreg_addr[board_type];
122
- exynos4_board_binfo.gic_cpu_if_addr =
123
- EXYNOS4210_SMP_PRIVATE_BASE_ADDR + 0x100;
113
+ s->bootinfo.loader_start = EXYNOS4210_BASE_BOOT_ADDR;
114
+ s->bootinfo.smp_loader_start = EXYNOS4210_SMP_BOOT_ADDR;
115
+ s->bootinfo.write_secondary_boot = exynos4210_write_secondary;
116
+ s->bootinfo.ram_size = exynos4_board_ram_size[board_type];
117
+ s->bootinfo.board_id = exynos4_board_id[board_type];
118
+ s->bootinfo.smp_bootreg_addr = exynos4_board_smp_bootreg_addr[board_type];
119
+ s->bootinfo.gic_cpu_if_addr = EXYNOS4210_SMP_PRIVATE_BASE_ADDR + 0x100;
120
121
exynos4_boards_init_ram(s, get_system_memory(),
122
exynos4_board_ram_size[board_type]);
133
Exynos4BoardState *s = exynos4_boards_init_common(machine,
134
EXYNOS4_BOARD_NURI);
135
140
- arm_load_kernel(s->soc.cpu[0], machine, &exynos4_board_binfo);
136
+ arm_load_kernel(s->soc.cpu[0], machine, &s->bootinfo);
137
}
138
139
static void smdkc210_init(MachineState *machine)
143
144
lan9215_init(SMDK_LAN9118_BASE_ADDR,
145
qemu_irq_invert(s->soc.irq_table[exynos4210_get_irq(37, 1)]));
150
- arm_load_kernel(s->soc.cpu[0], machine, &exynos4_board_binfo);
146
+ arm_load_kernel(s->soc.cpu[0], machine, &s->bootinfo);
147
}
148
149
static const char * const valid_cpu_types[] = {