summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2012-05-17 11:48:16 +0200
committerAlexander Graf <agraf@suse.de>2012-06-24 01:04:47 +0200
commit625e665b61184cabce0d556910de05cc8a70169c (patch)
tree024227d4fa9f3dccff2b77943c36d5bf733ae204
parentdd0bcfca64d12f557fae67a0ca318bf9b5579dd9 (diff)
downloadqemu-625e665b61184cabce0d556910de05cc8a70169c.tar.gz
PPC: e500: dt: create /cpus node dynamically
Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--hw/ppce500_mpc8544ds.c5
-rw-r--r--pc-bios/mpc8544ds.dtbbin1972 -> 1924 bytes
-rw-r--r--pc-bios/mpc8544ds.dts5
3 files changed, 5 insertions, 5 deletions
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 3ec90133fd..c046206e16 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -125,6 +125,11 @@ static int mpc8544_load_device_tree(CPUPPCState *env,
hypercall, sizeof(hypercall));
}
+ /* Create CPU nodes */
+ qemu_devtree_add_subnode(fdt, "/cpus");
+ qemu_devtree_setprop_cell(fdt, "/cpus", "#address-cells", 1);
+ qemu_devtree_setprop_cell(fdt, "/cpus", "#size-cells", 0);
+
/* We need to generate the cpu nodes in reverse order, so Linux can pick
the first node as boot node and be happy */
for (i = smp_cpus - 1; i >= 0; i--) {
diff --git a/pc-bios/mpc8544ds.dtb b/pc-bios/mpc8544ds.dtb
index db9fb701f2..a85b93c1e6 100644
--- a/pc-bios/mpc8544ds.dtb
+++ b/pc-bios/mpc8544ds.dtb
Binary files differ
diff --git a/pc-bios/mpc8544ds.dts b/pc-bios/mpc8544ds.dts
index f46e9ede06..1fcb8658fd 100644
--- a/pc-bios/mpc8544ds.dts
+++ b/pc-bios/mpc8544ds.dts
@@ -22,11 +22,6 @@
pci0 = &pci0;
};
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
- };
-
soc8544@e0000000 {
#address-cells = <1>;
#size-cells = <1>;