ARM: zynq: Fix all remaining zynq platform to use stdout-path

Fix console setup for all remaining zynq boards.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynq-afx-nand.dts b/arch/arm/dts/zynq-afx-nand.dts
index 5587c008769b5d72947f89111b3388c0c04b4a3f..3a78dddd700fc77fc6b81d9b19d98d201703cc27 100644 (file)
--- a/arch/arm/dts/zynq-afx-nand.dts
+++ b/arch/arm/dts/zynq-afx-nand.dts
@@ -23,9 +23,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 {

diff --git a/arch/arm/dts/zynq-afx-nor.dts b/arch/arm/dts/zynq-afx-nor.dts
index 5af5630bf5d530645d5bc50d4dd30ccacd224a2a..a7558bea291225530a627218cc0afc3e646c7fb6 100644 (file)
--- a/arch/arm/dts/zynq-afx-nor.dts
+++ b/arch/arm/dts/zynq-afx-nor.dts
@@ -23,9 +23,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 {

diff --git a/arch/arm/dts/zynq-afx-qspi.dts b/arch/arm/dts/zynq-afx-qspi.dts
index 7e8d2d56d14cb3fe9754acce4f2fd3d9a131677f..4a11d8881b8af83d69c63ed74cbfb3e5d10358e5 100644 (file)
--- a/arch/arm/dts/zynq-afx-qspi.dts
+++ b/arch/arm/dts/zynq-afx-qspi.dts
@@ -24,9 +24,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 {

diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts
index 49f2547730379da2b369a45e72e311773ea8a0b9..5ee799f7d716e6683786458b7391997f4cdf9224 100644 (file)
--- a/arch/arm/dts/zynq-cc108.dts
+++ b/arch/arm/dts/zynq-cc108.dts
@@ -25,9 +25,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 {

diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index d99a604e79dd97246ccd3a352b9ed321dda00f05..4c10e5e9931761ee8bcf563a30c4521fbb1c2f20 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 {

diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts
index 1dd5357f4e0faed9be24a57a24b9193a190fbf87..c2e722b34ffc5f21c040aaf43c1970156a28d32e 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/dts/zynq-zc770-xm011.dts
@@ -18,9 +18,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 {

diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts
index 3b3232d70b4fff4542e8726269df6b938b8424d1..5db689f7a85a77655e760362257e3725a5e75324 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/dts/zynq-zc770-xm012.dts
@@ -20,9 +20,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 {

diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts
index b8ed4134351e20fc7e398e7c90d17f1173d8e10e..853e50cad3c212c71ee86487286d60853ef51d84 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/dts/zynq-zc770-xm013.dts
@@ -21,9 +21,8 @@
        };
 
        chosen {
-               bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
-               linux,stdout-path = &uart0;
-               stdout-path = &uart0;
+               bootargs = "root=/dev/ram rw earlyprintk";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {