summaryrefslogtreecommitdiff
path: root/arch/arm/dts/zynq-zc770-xm010.dts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-27 23:05:12 +0300
committerTom Rini <trini@konsulko.com>2016-01-27 23:05:12 +0300
commit19bde0316f2c58b3ab6357832790aee6ed7a4ad5 (patch)
tree8216f416e21cf71745abaec2c5a42ab9824b290e /arch/arm/dts/zynq-zc770-xm010.dts
parentb20c38a973a51bf3f663bd298c63ad1b8e0de445 (diff)
parentf36919a8138ed7ecd3dbce4630e02936b13907da (diff)
downloadu-boot-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.tar.xz
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/dts/zynq-zc770-xm010.dts')
-rw-r--r--arch/arm/dts/zynq-zc770-xm010.dts5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index 07e2b7a738..b6982c0c45 100644
--- 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 {