diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-06-27 17:00:04 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-06-27 19:31:42 +1000 |
commit | 3918bf6a59283d6f7e3d42747fbce41a314616fb (patch) | |
tree | 1e1762b8851000e14b1c3638ce41ddc87ad0b192 /board-qemu/slof | |
parent | f21b89fffc1707032980a47ed3f694e5bb6a43b9 (diff) | |
download | SLOF-3918bf6a59283d6f7e3d42747fbce41a314616fb.zip SLOF-3918bf6a59283d6f7e3d42747fbce41a314616fb.tar.gz SLOF-3918bf6a59283d6f7e3d42747fbce41a314616fb.tar.bz2 |
Look for /memory@0, not just /memory
In a couple of places, SLOF looks for a memory node to get its
initial boot memory size and to set /chosen/memory & maintain
the "available" property.
SLOF can only really deal with one memory node, so make sure it
uses the one "@0" which also corresponds to the RMA.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'board-qemu/slof')
-rw-r--r-- | board-qemu/slof/fdt.fs | 4 | ||||
-rw-r--r-- | board-qemu/slof/tree.fs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/board-qemu/slof/fdt.fs b/board-qemu/slof/fdt.fs index 28096a7..c296ec6 100644 --- a/board-qemu/slof/fdt.fs +++ b/board-qemu/slof/fdt.fs @@ -226,7 +226,9 @@ fdt-unflatten-tree \ Find memory size : fdt-parse-memory - " /memory" find-device + \ XXX FIXME Handle more than one memory node, and deal + \ with RMA vs. full access + " /memory@0" find-device " reg" get-node get-package-property IF throw -1 THEN \ XXX FIXME Assume one entry only in "reg" property for now diff --git a/board-qemu/slof/tree.fs b/board-qemu/slof/tree.fs index d00f5af..dbf6b09 100644 --- a/board-qemu/slof/tree.fs +++ b/board-qemu/slof/tree.fs @@ -142,7 +142,7 @@ populate-pci-busses 6c0 cp s" /cpus/@0" open-dev encode-int s" cpu" set-chosen -s" /memory" open-dev encode-int s" memory" set-chosen +s" /memory@0" open-dev encode-int s" memory" set-chosen 6e0 cp |