Skip to content

Commit

Permalink
ARM: dts: aspeed: Add default memory node
Browse files Browse the repository at this point in the history
When we removed the inclusion of skeleton.dtsi from the device trees, we
broke booting for systems with bootloaders that aren't device tre aware.
This can be seen, for example, when appending the device tree blob to
the kernel image.

The reason booting broke was that the kernel lacked the device_type
label in the memory node. Add in a default memory node wth the
device_type. It can contain the memory address as the location is fixed
for each SoC generation, but the size needs to be added by the
bootloader or the board specific dts.

Fixes: 73102d6 ("ARM: dts: aspeed: Remove skeleton.dtsi")
Cc: <stable@vger.kernel.org>
Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Joel Stanley authored and Arnd Bergmann committed Mar 14, 2018
1 parent aa110a2 commit 9bdc00a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/aspeed-g4.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
};
};

memory@40000000 {
device_type = "memory";
reg = <0x40000000 0>;
};

ahb {
compatible = "simple-bus";
#address-cells = <1>;
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/aspeed-g5.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
};
};

memory@80000000 {
device_type = "memory";
reg = <0x80000000 0>;
};

ahb {
compatible = "simple-bus";
#address-cells = <1>;
Expand Down

0 comments on commit 9bdc00a

Please sign in to comment.