david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PPC: e500: enable manual loading of dtb blob

Browse Source 
We want to be able to override the automatically created device tree
by using the -dtb option. Implement this for the mpc8544ds machine.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2012-05-22 14:28:50 +02:00
parent 7f47b41f3f
commit d1b935659b
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/ppce500_mpc8544ds.c
View File

@ -113,6 +113,27 @@ static int mpc8544_load_device_tree(CPUPPCState *env,
0x0, 0x10000 }; 0x0, 0x10000 };
QemuOpts *machine_opts; QemuOpts *machine_opts;
const char *dumpdtb = NULL; const char *dumpdtb = NULL;
const char *dtb_file = NULL;
machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
if (machine_opts) {
dumpdtb = qemu_opt_get(machine_opts, "dumpdtb");
dtb_file = qemu_opt_get(machine_opts, "dtb");
}
if (dtb_file) {
char *filename;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_file);
if (!filename) {
goto out;
}
fdt = load_device_tree(filename, &fdt_size);
if (!fdt) {
goto out;
}
goto done;
}
fdt = create_device_tree(&fdt_size); fdt = create_device_tree(&fdt_size);
if (fdt == NULL) { if (fdt == NULL) {
@ -302,10 +323,7 @@ static int mpc8544_load_device_tree(CPUPPCState *env,
qemu_devtree_setprop_cell(fdt, pci, "#address-cells", 3); qemu_devtree_setprop_cell(fdt, pci, "#address-cells", 3);
qemu_devtree_setprop_string(fdt, "/aliases", "pci0", pci); qemu_devtree_setprop_string(fdt, "/aliases", "pci0", pci);
machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); done:
if (machine_opts) {
dumpdtb = qemu_opt_get(machine_opts, "dumpdtb");
}
if (dumpdtb) { if (dumpdtb) {
/* Dump the dtb to a file and quit */ /* Dump the dtb to a file and quit */
FILE *f = fopen(dumpdtb, "wb"); FILE *f = fopen(dumpdtb, "wb");