diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-03 19:30:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-03 19:30:54 -0500 |
| commit | 0a3d59e01038a3a50484b8bfcf834376a7215af0 (patch) | |
| tree | fc58f6aa543d4f920d1b4b36dc52c534d6dc1afc /arch/arm/dts/zynqmp-zc1232-revA.dts | |
| parent | 9981c60ef583f3608eff8ab4837198f72240ea17 (diff) | |
| parent | 5f68f44c14ab93ffc44a9285e0970cba467276c6 (diff) | |
Merge tag 'xilinx-for-v2019.01' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2019.01
microblaze:
- Use default functions for memory decoding
- Showing model from DT
zynq:
- Fix spi flash DTs
- Fix zynq_help_text with CONFIG_SYS_LONGHELP
- Tune cse/mini configurations
- Enabling cse/mini testing with current targets
zynqmp:
- Enable gzip SPL support
- Fix chip detection logic
- Tune mini configurations
- DT fixes(spi-flash, models, clocks, etc)
- Add support for OF_SEPARATE configurations
- Enabling mini testing with current targets
- Add mini mtest configuration
- Some minor config setting
nand:
- arasan: Add subpage configuration
net:
- gem: Add 64bit DMA support
Diffstat (limited to 'arch/arm/dts/zynqmp-zc1232-revA.dts')
| -rw-r--r-- | arch/arm/dts/zynqmp-zc1232-revA.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/zynqmp-zc1232-revA.dts b/arch/arm/dts/zynqmp-zc1232-revA.dts index ea1ca561a1..5c212ba468 100644 --- a/arch/arm/dts/zynqmp-zc1232-revA.dts +++ b/arch/arm/dts/zynqmp-zc1232-revA.dts @@ -41,7 +41,7 @@ &qspi { status = "okay"; flash@0 { - compatible = "m25p80"; /* 32MB FIXME */ + compatible = "m25p80", "spi-flash"; /* 32MB FIXME */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>; |