Merge tag 'zynqmp-soc-for-v5.7' of https://github.com/Xilinx/linux-xlnx into arm/soc
authorArnd Bergmann <arnd@arndb.de>
Wed, 25 Mar 2020 20:06:37 +0000 (21:06 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 25 Mar 2020 20:06:37 +0000 (21:06 +0100)
arm64: soc: ZynqMP SoC changes for v5.7

- Change firmware dependency to be able to disable it

* tag 'zynqmp-soc-for-v5.7' of https://github.com/Xilinx/linux-xlnx:
  arm64: zynqmp: Make zynqmp_firmware driver optional
  include: linux: firmware: Correct config dependency of zynqmp_eemi_ops

Link: https://lore.kernel.org/r/ecef6de5-8318-9f88-db8c-7c33fe44901f@monstr.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm64/Kconfig.platforms

Simple merge