[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/25] PPC: e500: enable manual loading of dtb blob
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 24/25] PPC: e500: enable manual loading of dtb blob |
Date: |
Wed, 30 May 2012 13:00:45 +0200 |
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 <address@hidden>
---
hw/ppce500_mpc8544ds.c | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 9c41f50..716a9e8 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -112,6 +112,27 @@ static int mpc8544_load_device_tree(CPUPPCState *env,
0x0, 0x10000 };
QemuOpts *machine_opts;
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);
if (fdt == NULL) {
@@ -300,10 +321,7 @@ static int mpc8544_load_device_tree(CPUPPCState *env,
qemu_devtree_setprop_cell(fdt, pci, "#address-cells", 3);
qemu_devtree_setprop_string(fdt, "/aliases", "pci0", pci);
- machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
- if (machine_opts) {
- dumpdtb = qemu_opt_get(machine_opts, "dumpdtb");
- }
+done:
if (dumpdtb) {
/* Dump the dtb to a file and quit */
FILE *f = fopen(dumpdtb, "wb");
--
1.6.0.2
- [Qemu-devel] [PATCH 18/25] PPC: e500: dt: create global-utils node dynamically, (continued)
- [Qemu-devel] [PATCH 18/25] PPC: e500: dt: create global-utils node dynamically, Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 11/25] PPC: e500: dt: create /cpus node dynamically, Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 13/25] PPC: e500: dt: create / node dynamically, Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 14/25] PPC: e500: dt: create /chosen node dynamically, Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 22/25] PPC: e500: dt: use 64bit cell helper, Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 06/25] dt: add helper for empty dt creation, Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 24/25] PPC: e500: enable manual loading of dtb blob,
Alexander Graf <=
- [Qemu-devel] [PATCH 25/25] Revert "dt: temporarily disable subtree creation failure check", Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 19/25] PPC: e500: dt: create pci node dynamically, Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 21/25] dt: Add -machine dumpdtb option to dump the current dtb, Alexander Graf, 2012/05/30
- [Qemu-devel] [PATCH 23/25] PPC: e500: dt: use target_phys_addr_t for ramsize, Alexander Graf, 2012/05/30