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 <s...@chromium.org>
---

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

diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 301c73f..bd6bff6 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/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@7e003000 {
                        compatible = "brcm,bcm2835-system-timer";
@@ -92,7 +94,7 @@
                        #interrupt-cells = <2>;
                };
 
-               uart@7e201000 {
+               uart: uart@7e201000 {
                        compatible = "brcm,bcm2835-pl011", "arm,pl011", 
"arm,primecell";
                        reg = <0x7e201000 0x1000>;
                        interrupts = <2 25>;
-- 
2.5.0.rc2.392.g76e840b

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to