Merge branch 'master' of git://git.denx.de/u-boot-x86

[u-boot] / arch / arm / dts / zynq-zc770-xm010.dts

diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index cf56ac8d822f1896cddbb3151538b716b7b2f657..b6982c0c45dae9f3e03f527606476001a594c427 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -21,9 +21,8 @@
        };
 
        chosen {
-               bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
-               linux,stdout-path = &uart1;
-               stdout-path = &uart1;
+               bootargs = "root=/dev/ram rw earlyprintk";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {
@@ -88,6 +87,7 @@
 };
 
 &uart1 {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };