Merge https://source.denx.de/u-boot/custodians/u-boot-samsung

[platform/kernel/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ff51a4e..3a745ce 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -955,7 +955,7 @@ config ARCH_SOCFPGA
        select SPL_SEPARATE_BSS if TARGET_SOCFPGA_SOC64
        select SPL_SERIAL_SUPPORT
        select SPL_SYSRESET
-       select SPL_WATCHDOG_SUPPORT
+       select SPL_WATCHDOG
        select SUPPORT_SPL
        select SYS_NS16550
        select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
@@ -1020,11 +1020,11 @@ config ARCH_SUNXI
        imply FIT
        imply OF_LIBFDT_OVERLAY
        imply PRE_CONSOLE_BUFFER
-       imply SPL_GPIO_SUPPORT
+       imply SPL_GPIO
        imply SPL_LIBCOMMON_SUPPORT
        imply SPL_LIBGENERIC_SUPPORT
        imply SPL_MMC_SUPPORT if MMC
-       imply SPL_POWER_SUPPORT
+       imply SPL_POWER
        imply SPL_SERIAL_SUPPORT
        imply USB_GADGET