[U-Boot] [PATCH v3 04/11] arm: rpi: Device tree modifications for U-Boot

Simon Glass
2015-08-07T13:42:24Z

This updates the device tree from the kernel version to something suitable
for U-Boot:

- Add stdout-path alias for console
- Mark the /soc node to be available pre-relocation so that the early serial
console works (we need the 'ranges' property to be available)

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v3: None
Changes in v2: None

arch/arm/dts/bcm2835.dtsi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/bcm2835.dtsi b/arch/arm/dts/bcm2835.dtsi
index 301c73f..bd6bff6 100644
--- a/arch/arm/dts/bcm2835.dtsi
+++ b/arch/arm/dts/bcm2835.dtsi
@@ -8,6 +8,7 @@

chosen {
bootargs = "earlyprintk console=ttyAMA0";
+ stdout-path = &uart;
};

soc {
@@ -16,6 +17,7 @@
#size-cells = <1>;
ranges = <0x7e000000 0x20000000 0x02000000>;
dma-ranges = <0x40000000 0x00000000 0x20000000>;
+ u-boot,dm-pre-reloc;

timer at 7e003000 {
compatible = "brcm,bcm2835-system-timer";
@@ -92,7 +94,7 @@
#interrupt-cells = <2>;
};

- uart at 7e201000 {
+ uart: uart at 7e201000 {
compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
reg = <0x7e201000 0x1000>;
interrupts = <2 25>;
--
2.5.0.rc2.392.g76e840b