Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)
- Drop zipitz2 board (Tom)
- Add DEPRECATED option (Tom)
- Mark legacy or non-dm drivers as DEPRECATED (Jagan)

1  2 
Kconfig
Makefile
drivers/spi/Kconfig
env/Kconfig

diff --cc Kconfig
Simple merge
diff --cc Makefile
Simple merge
Simple merge
diff --cc env/Kconfig
Simple merge