Revision f93eb9ff hw/arm_boot.c
b/hw/arm_boot.c | ||
---|---|---|
47 | 47 |
CPUState *env = opaque; |
48 | 48 |
|
49 | 49 |
cpu_reset(env); |
50 |
if (env->kernel_filename) |
|
51 |
arm_load_kernel(env, env->ram_size, env->kernel_filename, |
|
52 |
env->kernel_cmdline, env->initrd_filename, |
|
53 |
env->board_id, env->loader_start); |
|
50 |
if (env->boot_info) |
|
51 |
arm_load_kernel(env, env->boot_info); |
|
54 | 52 |
|
55 | 53 |
/* TODO: Reset secondary CPUs. */ |
56 | 54 |
} |
57 | 55 |
|
58 |
static void set_kernel_args(uint32_t ram_size, int initrd_size, |
|
59 |
const char *kernel_cmdline, |
|
60 |
target_phys_addr_t loader_start) |
|
56 |
static void set_kernel_args(struct arm_boot_info *info, |
|
57 |
int initrd_size, void *base) |
|
61 | 58 |
{ |
62 | 59 |
uint32_t *p; |
63 | 60 |
|
64 |
p = (uint32_t *)(phys_ram_base + KERNEL_ARGS_ADDR);
|
|
61 |
p = (uint32_t *)(base + KERNEL_ARGS_ADDR); |
|
65 | 62 |
/* ATAG_CORE */ |
66 | 63 |
stl_raw(p++, 5); |
67 | 64 |
stl_raw(p++, 0x54410001); |
... | ... | |
69 | 66 |
stl_raw(p++, 0x1000); |
70 | 67 |
stl_raw(p++, 0); |
71 | 68 |
/* ATAG_MEM */ |
69 |
/* TODO: handle multiple chips on one ATAG list */ |
|
72 | 70 |
stl_raw(p++, 4); |
73 | 71 |
stl_raw(p++, 0x54410002); |
74 |
stl_raw(p++, ram_size); |
|
75 |
stl_raw(p++, loader_start); |
|
72 |
stl_raw(p++, info->ram_size);
|
|
73 |
stl_raw(p++, info->loader_start);
|
|
76 | 74 |
if (initrd_size) { |
77 | 75 |
/* ATAG_INITRD2 */ |
78 | 76 |
stl_raw(p++, 4); |
79 | 77 |
stl_raw(p++, 0x54420005); |
80 |
stl_raw(p++, loader_start + INITRD_LOAD_ADDR); |
|
78 |
stl_raw(p++, info->loader_start + INITRD_LOAD_ADDR);
|
|
81 | 79 |
stl_raw(p++, initrd_size); |
82 | 80 |
} |
83 |
if (kernel_cmdline && *kernel_cmdline) {
|
|
81 |
if (info->kernel_cmdline && *info->kernel_cmdline) {
|
|
84 | 82 |
/* ATAG_CMDLINE */ |
85 | 83 |
int cmdline_size; |
86 | 84 |
|
87 |
cmdline_size = strlen(kernel_cmdline); |
|
88 |
memcpy (p + 2, kernel_cmdline, cmdline_size + 1);
|
|
85 |
cmdline_size = strlen(info->kernel_cmdline);
|
|
86 |
memcpy(p + 2, info->kernel_cmdline, cmdline_size + 1);
|
|
89 | 87 |
cmdline_size = (cmdline_size >> 2) + 1; |
90 | 88 |
stl_raw(p++, cmdline_size + 2); |
91 | 89 |
stl_raw(p++, 0x54410009); |
92 | 90 |
p += cmdline_size; |
93 | 91 |
} |
92 |
if (info->atag_board) { |
|
93 |
/* ATAG_BOARD */ |
|
94 |
int atag_board_len; |
|
95 |
|
|
96 |
atag_board_len = (info->atag_board(info, p + 2) + 3) >> 2; |
|
97 |
stl_raw(p++, 2 + atag_board_len); |
|
98 |
stl_raw(p++, 0x414f4d50); |
|
99 |
p += atag_board_len; |
|
100 |
} |
|
94 | 101 |
/* ATAG_END */ |
95 | 102 |
stl_raw(p++, 0); |
96 | 103 |
stl_raw(p++, 0); |
97 | 104 |
} |
98 | 105 |
|
99 |
static void set_kernel_args_old(uint32_t ram_size, int initrd_size, |
|
100 |
const char *kernel_cmdline, |
|
101 |
target_phys_addr_t loader_start) |
|
106 |
static void set_kernel_args_old(struct arm_boot_info *info, |
|
107 |
int initrd_size, void *base) |
|
102 | 108 |
{ |
103 | 109 |
uint32_t *p; |
104 | 110 |
unsigned char *s; |
105 | 111 |
|
106 | 112 |
/* see linux/include/asm-arm/setup.h */ |
107 |
p = (uint32_t *)(phys_ram_base + KERNEL_ARGS_ADDR);
|
|
113 |
p = (uint32_t *)(base + KERNEL_ARGS_ADDR); |
|
108 | 114 |
/* page_size */ |
109 | 115 |
stl_raw(p++, 4096); |
110 | 116 |
/* nr_pages */ |
111 |
stl_raw(p++, ram_size / 4096); |
|
117 |
stl_raw(p++, info->ram_size / 4096);
|
|
112 | 118 |
/* ramdisk_size */ |
113 | 119 |
stl_raw(p++, 0); |
114 | 120 |
#define FLAG_READONLY 1 |
... | ... | |
142 | 148 |
stl_raw(p++, 0); |
143 | 149 |
/* initrd_start */ |
144 | 150 |
if (initrd_size) |
145 |
stl_raw(p++, loader_start + INITRD_LOAD_ADDR); |
|
151 |
stl_raw(p++, info->loader_start + INITRD_LOAD_ADDR);
|
|
146 | 152 |
else |
147 | 153 |
stl_raw(p++, 0); |
148 | 154 |
/* initrd_size */ |
... | ... | |
159 | 165 |
stl_raw(p++, 0); |
160 | 166 |
/* zero unused fields */ |
161 | 167 |
memset(p, 0, 256 + 1024 - |
162 |
(p - ((uint32_t *)(phys_ram_base + KERNEL_ARGS_ADDR))));
|
|
163 |
s = phys_ram_base + KERNEL_ARGS_ADDR + 256 + 1024;
|
|
164 |
if (kernel_cmdline) |
|
165 |
strcpy (s, kernel_cmdline); |
|
168 |
(p - ((uint32_t *)(base + KERNEL_ARGS_ADDR)))); |
|
169 |
s = base + KERNEL_ARGS_ADDR + 256 + 1024; |
|
170 |
if (info->kernel_cmdline)
|
|
171 |
strcpy (s, info->kernel_cmdline);
|
|
166 | 172 |
else |
167 | 173 |
stb_raw(s, 0); |
168 | 174 |
} |
169 | 175 |
|
170 |
void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename, |
|
171 |
const char *kernel_cmdline, const char *initrd_filename, |
|
172 |
int board_id, target_phys_addr_t loader_start) |
|
176 |
void arm_load_kernel(CPUState *env, struct arm_boot_info *info) |
|
173 | 177 |
{ |
174 | 178 |
int kernel_size; |
175 | 179 |
int initrd_size; |
... | ... | |
177 | 181 |
int is_linux = 0; |
178 | 182 |
uint64_t elf_entry; |
179 | 183 |
target_ulong entry; |
184 |
uint32_t pd; |
|
185 |
void *loader_phys; |
|
180 | 186 |
|
181 | 187 |
/* Load the kernel. */ |
182 |
if (!kernel_filename) { |
|
188 |
if (!info->kernel_filename) {
|
|
183 | 189 |
fprintf(stderr, "Kernel image must be specified\n"); |
184 | 190 |
exit(1); |
185 | 191 |
} |
186 | 192 |
|
187 |
if (!env->kernel_filename) { |
|
188 |
env->ram_size = ram_size; |
|
189 |
env->kernel_filename = kernel_filename; |
|
190 |
env->kernel_cmdline = kernel_cmdline; |
|
191 |
env->initrd_filename = initrd_filename; |
|
192 |
env->board_id = board_id; |
|
193 |
env->loader_start = loader_start; |
|
193 |
if (!env->boot_info) { |
|
194 |
if (info->nb_cpus == 0) |
|
195 |
info->nb_cpus = 1; |
|
196 |
env->boot_info = info; |
|
194 | 197 |
qemu_register_reset(main_cpu_reset, env); |
195 | 198 |
} |
199 |
|
|
200 |
pd = cpu_get_physical_page_desc(info->loader_start); |
|
201 |
loader_phys = phys_ram_base + (pd & TARGET_PAGE_MASK) + |
|
202 |
(info->loader_start & ~TARGET_PAGE_MASK); |
|
203 |
|
|
196 | 204 |
/* Assume that raw images are linux kernels, and ELF images are not. */ |
197 |
kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL); |
|
205 |
kernel_size = load_elf(info->kernel_filename, 0, &elf_entry, NULL, NULL);
|
|
198 | 206 |
entry = elf_entry; |
199 | 207 |
if (kernel_size < 0) { |
200 |
kernel_size = load_uboot(kernel_filename, &entry, &is_linux); |
|
208 |
kernel_size = load_uboot(info->kernel_filename, &entry, &is_linux);
|
|
201 | 209 |
} |
202 | 210 |
if (kernel_size < 0) { |
203 |
kernel_size = load_image(kernel_filename, |
|
204 |
phys_ram_base + KERNEL_LOAD_ADDR);
|
|
205 |
entry = loader_start + KERNEL_LOAD_ADDR; |
|
211 |
kernel_size = load_image(info->kernel_filename,
|
|
212 |
loader_phys + KERNEL_LOAD_ADDR);
|
|
213 |
entry = info->loader_start + KERNEL_LOAD_ADDR;
|
|
206 | 214 |
is_linux = 1; |
207 | 215 |
} |
208 | 216 |
if (kernel_size < 0) { |
209 |
fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); |
|
217 |
fprintf(stderr, "qemu: could not load kernel '%s'\n", |
|
218 |
info->kernel_filename); |
|
210 | 219 |
exit(1); |
211 | 220 |
} |
212 | 221 |
if (!is_linux) { |
... | ... | |
214 | 223 |
env->regs[15] = entry & 0xfffffffe; |
215 | 224 |
env->thumb = entry & 1; |
216 | 225 |
} else { |
217 |
if (initrd_filename) { |
|
218 |
initrd_size = load_image(initrd_filename, |
|
219 |
phys_ram_base + INITRD_LOAD_ADDR);
|
|
226 |
if (info->initrd_filename) {
|
|
227 |
initrd_size = load_image(info->initrd_filename,
|
|
228 |
loader_phys + INITRD_LOAD_ADDR);
|
|
220 | 229 |
if (initrd_size < 0) { |
221 | 230 |
fprintf(stderr, "qemu: could not load initrd '%s'\n", |
222 |
initrd_filename); |
|
231 |
info->initrd_filename);
|
|
223 | 232 |
exit(1); |
224 | 233 |
} |
225 | 234 |
} else { |
226 | 235 |
initrd_size = 0; |
227 | 236 |
} |
228 |
bootloader[1] |= board_id & 0xff; |
|
229 |
bootloader[2] |= (board_id >> 8) & 0xff; |
|
230 |
bootloader[5] = loader_start + KERNEL_ARGS_ADDR; |
|
237 |
bootloader[1] |= info->board_id & 0xff;
|
|
238 |
bootloader[2] |= (info->board_id >> 8) & 0xff;
|
|
239 |
bootloader[5] = info->loader_start + KERNEL_ARGS_ADDR;
|
|
231 | 240 |
bootloader[6] = entry; |
232 | 241 |
for (n = 0; n < sizeof(bootloader) / 4; n++) |
233 |
stl_raw(phys_ram_base + (n * 4), bootloader[n]); |
|
234 |
for (n = 0; n < sizeof(smpboot) / 4; n++) |
|
235 |
stl_raw(phys_ram_base + ram_size + (n * 4), smpboot[n]); |
|
242 |
stl_raw(loader_phys + (n * 4), bootloader[n]); |
|
243 |
if (info->nb_cpus > 1) |
|
244 |
for (n = 0; n < sizeof(smpboot) / 4; n++) |
|
245 |
stl_raw(loader_phys + info->ram_size + (n * 4), smpboot[n]); |
|
236 | 246 |
if (old_param) |
237 |
set_kernel_args_old(ram_size, initrd_size, |
|
238 |
kernel_cmdline, loader_start); |
|
247 |
set_kernel_args_old(info, initrd_size, loader_phys); |
|
239 | 248 |
else |
240 |
set_kernel_args(ram_size, initrd_size, |
|
241 |
kernel_cmdline, loader_start); |
|
249 |
set_kernel_args(info, initrd_size, loader_phys); |
|
242 | 250 |
} |
243 | 251 |
} |
Also available in: Unified diff