Revision 5a4348d1 hw/arm/boot.c
| b/hw/arm/boot.c | ||
|---|---|---|
| 335 | 335 |
} |
| 336 | 336 |
} |
| 337 | 337 |
|
| 338 |
acells = qemu_devtree_getprop_cell(fdt, "/", "#address-cells");
|
|
| 339 |
scells = qemu_devtree_getprop_cell(fdt, "/", "#size-cells");
|
|
| 338 |
acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells");
|
|
| 339 |
scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells");
|
|
| 340 | 340 |
if (acells == 0 || scells == 0) {
|
| 341 | 341 |
fprintf(stderr, "dtb file invalid (#address-cells or #size-cells 0)\n"); |
| 342 | 342 |
goto fail; |
| ... | ... | |
| 351 | 351 |
goto fail; |
| 352 | 352 |
} |
| 353 | 353 |
|
| 354 |
rc = qemu_devtree_setprop_sized_cells(fdt, "/memory", "reg",
|
|
| 355 |
acells, binfo->loader_start,
|
|
| 356 |
scells, binfo->ram_size);
|
|
| 354 |
rc = qemu_fdt_setprop_sized_cells(fdt, "/memory", "reg",
|
|
| 355 |
acells, binfo->loader_start, |
|
| 356 |
scells, binfo->ram_size); |
|
| 357 | 357 |
if (rc < 0) {
|
| 358 | 358 |
fprintf(stderr, "couldn't set /memory/reg\n"); |
| 359 | 359 |
goto fail; |
| 360 | 360 |
} |
| 361 | 361 |
|
| 362 | 362 |
if (binfo->kernel_cmdline && *binfo->kernel_cmdline) {
|
| 363 |
rc = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs",
|
|
| 364 |
binfo->kernel_cmdline);
|
|
| 363 |
rc = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
|
|
| 364 |
binfo->kernel_cmdline); |
|
| 365 | 365 |
if (rc < 0) {
|
| 366 | 366 |
fprintf(stderr, "couldn't set /chosen/bootargs\n"); |
| 367 | 367 |
goto fail; |
| ... | ... | |
| 369 | 369 |
} |
| 370 | 370 |
|
| 371 | 371 |
if (binfo->initrd_size) {
|
| 372 |
rc = qemu_devtree_setprop_cell(fdt, "/chosen", "linux,initrd-start",
|
|
| 373 |
binfo->initrd_start); |
|
| 372 |
rc = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start",
|
|
| 373 |
binfo->initrd_start);
|
|
| 374 | 374 |
if (rc < 0) {
|
| 375 | 375 |
fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n"); |
| 376 | 376 |
goto fail; |
| 377 | 377 |
} |
| 378 | 378 |
|
| 379 |
rc = qemu_devtree_setprop_cell(fdt, "/chosen", "linux,initrd-end",
|
|
| 380 |
binfo->initrd_start + binfo->initrd_size); |
|
| 379 |
rc = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
|
|
| 380 |
binfo->initrd_start + binfo->initrd_size);
|
|
| 381 | 381 |
if (rc < 0) {
|
| 382 | 382 |
fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n"); |
| 383 | 383 |
goto fail; |
| ... | ... | |
| 388 | 388 |
binfo->modify_dtb(binfo, fdt); |
| 389 | 389 |
} |
| 390 | 390 |
|
| 391 |
qemu_devtree_dumpdtb(fdt, size);
|
|
| 391 |
qemu_fdt_dumpdtb(fdt, size);
|
|
| 392 | 392 |
|
| 393 | 393 |
cpu_physical_memory_write(addr, fdt, size); |
| 394 | 394 |
|
Also available in: Unified diff