Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2221043b authored by Michal Simek's avatar Michal Simek
Browse files

ARM: dts: zynq: Fix stdout-path and bootargs 



parallella - Remove linux,stdout-path.
Use stdout-path to identify kernel console

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
parent 1b654bc9

arch/arm/boot/dts/zynq-parallella.dts

+2 −2
Original line number Diff line number Diff line
@@ -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";

	};

};

arch/arm/boot/dts/zynq-zc702.dts

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
	};



	chosen {

		bootargs = "console=ttyPS0,115200 earlyprintk";

		bootargs = "earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	leds {

arch/arm/boot/dts/zynq-zc706.dts

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
	};



	chosen {

		bootargs = "console=ttyPS0,115200 earlyprintk";

		bootargs = "earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	usb_phy0: phy0 {

arch/arm/boot/dts/zynq-zed.dts

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
	};



	chosen {

		bootargs = "console=ttyPS0,115200 earlyprintk";

		bootargs = "earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	usb_phy0: phy0 {

arch/arm/boot/dts/zynq-zybo.dts

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
	};



	chosen {

		bootargs = "console=ttyPS0,115200 earlyprintk";

		bootargs = "earlyprintk";

		stdout-path = "serial0:115200n8";

	};



};