]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: dts: aspeed: Add default memory node
authorJoel Stanley <joel@jms.id.au>
Wed, 14 Mar 2018 07:13:12 +0000 (17:43 +1030)
committerArnd Bergmann <arnd@arndb.de>
Wed, 14 Mar 2018 09:05:28 +0000 (10:05 +0100)
commit7e171c7c40c9ec620d34dd7721af35b9326cba9f
tree83573579bc8d04a711fb9c5fd5e95c5a0c5e7c66
parentfcb29f30795de353f0d42700645400a7c5e03e4d
ARM: dts: aspeed: Add default memory node

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: c6608805c392 ("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>
arch/arm/boot/dts/aspeed-g4.dtsi
arch/arm/boot/dts/aspeed-g5.dtsi