diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-13 12:53:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-13 12:53:11 -0400 |
| commit | 541c9be880d601cb0230dc7452c398167ed1eaac (patch) | |
| tree | 0686261e2d2e4589c651d165026d4e678390915a /arch/arm/dts/zynq-zybo.dts | |
| parent | 3f8085e94ae3e8a2996e2f517ecdb608a4b4c09e (diff) | |
| parent | 58ed7f66939cbfb6e48656b3925aefd9f180a1a3 (diff) | |
| download | talos-obmc-uboot-541c9be880d601cb0230dc7452c398167ed1eaac.tar.gz talos-obmc-uboot-541c9be880d601cb0230dc7452c398167ed1eaac.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/dts/zynq-zybo.dts')
| -rw-r--r-- | arch/arm/dts/zynq-zybo.dts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts index d04e9625d2..f8dcf1d699 100644 --- a/arch/arm/dts/zynq-zybo.dts +++ b/arch/arm/dts/zynq-zybo.dts @@ -26,13 +26,13 @@ }; chosen { - bootargs = "earlyprintk"; + bootargs = ""; stdout-path = "serial0:115200n8"; }; usb_phy0: phy0 { - #phy-cells = <0>; compatible = "usb-nop-xceiv"; + #phy-cells = <0>; reset-gpios = <&gpio0 46 1>; }; }; @@ -51,17 +51,17 @@ }; }; -&sdhci0 { +&qspi { u-boot,dm-pre-reloc; status = "okay"; }; -&uart1 { +&sdhci0 { u-boot,dm-pre-reloc; status = "okay"; }; -&qspi { +&uart1 { u-boot,dm-pre-reloc; status = "okay"; }; |
