Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / arch / arm / mach-socfpga / Kconfig

diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 5be9eaa456e9100fe08d66f4698dd909b5d51e61..d91b8bbcebc56c7dbd0622e1938d3d50e9b2dbb7 100644 (file)
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -19,8 +19,14 @@ config SPL_SERIAL_SUPPORT
        default y
 
 config SPL_SPI_FLASH_SUPPORT
+       default y if SPL_SPI_SUPPORT
+
+config SPL_SPI_SUPPORT
        default y if DM_SPI
 
+config SPL_WATCHDOG_SUPPORT
+       default y
+
 config TARGET_SOCFPGA_ARRIA5
        bool
        select TARGET_SOCFPGA_GEN5