diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-02-11 15:06:36 +0300 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-05-28 09:44:56 +0300 |
| commit | 2221043b75cf572b77450f56203b4fb77d51fc90 (patch) | |
| tree | ff774e728296f3ac60dbc6d68f5fc356bd79caad /arch | |
| parent | 1b654bc9d4d82aab754464d7f29a803ad58042ee (diff) | |
| download | linux-2221043b75cf572b77450f56203b4fb77d51fc90.tar.xz | |
ARM: dts: zynq: Fix stdout-path and bootargs
parallella - Remove linux,stdout-path.
Use stdout-path to identify kernel console
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/zynq-parallella.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc706.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zed.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zybo.dts | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts index 0ebd2107022b..9efd16cb2859 100644 --- a/arch/arm/boot/dts/zynq-parallella.dts +++ b/arch/arm/boot/dts/zynq-parallella.dts @@ -34,8 +34,8 @@ }; chosen { - bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait"; - linux,stdout-path = "/amba/serial@e0001000"; + bootargs = "earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait"; + stdout-path = "serial0:115200n8"; }; }; diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 1fc1d3911e9b..fb59d34e8ee6 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -30,7 +30,8 @@ }; chosen { - bootargs = "console=ttyPS0,115200 earlyprintk"; + bootargs = "earlyprintk"; + stdout-path = "serial0:115200n8"; }; leds { diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 850518d9b8ac..abf5d238ae04 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -30,7 +30,8 @@ }; chosen { - bootargs = "console=ttyPS0,115200 earlyprintk"; + bootargs = "earlyprintk"; + stdout-path = "serial0:115200n8"; }; usb_phy0: phy0 { diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts index 5658bc8434de..b9f2522012e8 100644 --- a/arch/arm/boot/dts/zynq-zed.dts +++ b/arch/arm/boot/dts/zynq-zed.dts @@ -29,7 +29,8 @@ }; chosen { - bootargs = "console=ttyPS0,115200 earlyprintk"; + bootargs = "earlyprintk"; + stdout-path = "serial0:115200n8"; }; usb_phy0: phy0 { diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts index 935a561f6aa6..16c9cacd668d 100644 --- a/arch/arm/boot/dts/zynq-zybo.dts +++ b/arch/arm/boot/dts/zynq-zybo.dts @@ -29,7 +29,8 @@ }; chosen { - bootargs = "console=ttyPS0,115200 earlyprintk"; + bootargs = "earlyprintk"; + stdout-path = "serial0:115200n8"; }; }; |