diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-27 15:05:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-27 15:05:12 -0500 |
| commit | 19bde0316f2c58b3ab6357832790aee6ed7a4ad5 (patch) | |
| tree | 8216f416e21cf71745abaec2c5a42ab9824b290e /arch/arm/dts/zynq-zc770-xm011.dts | |
| parent | b20c38a973a51bf3f663bd298c63ad1b8e0de445 (diff) | |
| parent | f36919a8138ed7ecd3dbce4630e02936b13907da (diff) | |
| download | blackbird-obmc-uboot-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.tar.gz blackbird-obmc-uboot-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/dts/zynq-zc770-xm011.dts')
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm011.dts | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts index 77e3bb0e63..4fed221536 100644 --- 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 { @@ -34,12 +33,6 @@ }; }; -&spi0 { - status = "okay"; - num-cs = <4>; - is-decoded-cs = <0>; -}; - &can0 { status = "okay"; }; @@ -54,6 +47,12 @@ }; }; +&spi0 { + status = "okay"; + num-cs = <4>; + is-decoded-cs = <0>; +}; + &uart1 { u-boot,dm-pre-reloc; status = "okay"; |
