diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-21 18:59:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-21 18:59:30 -0400 |
| commit | b4fde1633e67bb618fd33aad6e6322b7cecf1154 (patch) | |
| tree | d427acfe3e80e6614a6b9312cb91892dd3dfd8ac /arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi | |
| parent | 1f4ae66eaab29bfb5d1eb44996f7826c9cd01ed1 (diff) | |
| parent | e09c1a133155724d3369e150f3ab7b63c875101c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Various stratix10, gen5 updates
Diffstat (limited to 'arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi')
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi index e05ca8279a..db55a4ecad 100644 --- a/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi +++ b/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi @@ -6,15 +6,13 @@ * Copyright (c) 2018 Simon Goldschmidt */ +#include "socfpga-common-u-boot.dtsi" + /{ aliases { spi0 = "/soc/spi@ff705000"; udc0 = &usb0; }; - - soc { - u-boot,dm-pre-reloc; - }; }; &watchdog0 { |