Merge tag 'u-boot-atmel-2020.10-a' of https://gitlab.denx.de/u-boot/custodians/u...

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3ba7e33..760e901 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -550,6 +550,7 @@ config TARGET_GPLUGD
 config ARCH_DAVINCI
        bool "TI DaVinci"
        select CPU_ARM926EJS
+       select SPL_DM_SPI if SPL
        imply CMD_SAVES
        help
          Support for TI's DaVinci platform.
@@ -567,6 +568,8 @@ config ARCH_MVEBU
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH
+       select SPL_DM_SPI if SPL
+       select SPL_DM_SPI_FLASH if SPL
        select OF_CONTROL
        select OF_SEPARATE
        select SPI
@@ -874,11 +877,11 @@ config ARCH_MX7ULP
 config ARCH_MX7
        bool "Freescale MX7"
        select ARCH_MISC_INIT
-       select BOARD_EARLY_INIT_F
        select CPU_V7A
        select SYS_FSL_HAS_SEC if IMX_HAB
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
+       imply BOARD_EARLY_INIT_F
        imply MXC_GPIO
        imply SYS_THUMB_BUILD
 
@@ -986,6 +989,8 @@ config ARCH_SOCFPGA
        imply FAT_WRITE
        imply SPL
        imply SPL_DM
+       imply SPL_DM_SPI
+       imply SPL_DM_SPI_FLASH
        imply SPL_LIBDISK_SUPPORT
        imply SPL_MMC_SUPPORT
        imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
@@ -1094,6 +1099,8 @@ config ARCH_ZYNQ
        select SPL_BOARD_INIT if SPL
        select SPL_CLK if SPL
        select SPL_DM if SPL
+       select SPL_DM_SPI if SPL
+       select SPL_DM_SPI_FLASH if SPL
        select SPL_OF_CONTROL if SPL
        select SPL_SEPARATE_BSS if SPL
        select SUPPORT_SPL
@@ -1132,6 +1139,8 @@ config ARCH_ZYNQMP
        select OF_CONTROL
        select SPL_BOARD_INIT if SPL
        select SPL_CLK if SPL
+       select SPL_DM_SPI if SPI
+       select SPL_DM_SPI_FLASH if SPL_DM_SPI
        select SPL_DM_MAILBOX if SPL
        select SPL_FIRMWARE if SPL
        select SPL_SEPARATE_BSS if SPL
@@ -1448,6 +1457,8 @@ config TARGET_LS1021AQDS
        select SUPPORT_SPL
        select SYS_FSL_DDR
        select FSL_DDR_INTERACTIVE
+       select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
+       select SPI_FLASH_DATAFLASH if FSL_DSPI || FSL_QSPI
        imply SCSI
 
 config TARGET_LS1021ATWR
@@ -1461,6 +1472,7 @@ config TARGET_LS1021ATWR
        select CPU_V7_HAS_VIRT
        select LS1_DEEP_SLEEP
        select SUPPORT_SPL
+       select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
        imply SCSI
 
 config TARGET_LS1021ATSN
@@ -1485,6 +1497,7 @@ config TARGET_LS1021AIOT
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
        select SUPPORT_SPL
+       select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
        imply SCSI
        help
          Support for Freescale LS1021AIOT platform.
@@ -1502,6 +1515,8 @@ config TARGET_LS1043AQDS
        select BOARD_LATE_INIT
        select SUPPORT_SPL
        select FSL_DDR_INTERACTIVE if !SPL
+       select FSL_DSPI if !SPL_NO_DSPI
+       select DM_SPI_FLASH if FSL_DSPI
        imply SCSI
        imply SCSI_AHCI
        help
@@ -1516,6 +1531,8 @@ config TARGET_LS1043ARDB
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
        select SUPPORT_SPL
+       select FSL_DSPI if !SPL_NO_DSPI
+       select DM_SPI_FLASH if FSL_DSPI
        help
          Support for Freescale LS1043ARDB platform.
 
@@ -1681,6 +1698,8 @@ config ARCH_ROCKCHIP
        select OF_CONTROL
        select SPI
        select SPL_DM if SPL
+       select SPL_DM_SPI if SPL
+       select SPL_DM_SPI_FLASH if SPL
        select SYS_MALLOC_F
        select SYS_THUMB_BUILD if !ARM64
        imply ADC
@@ -1906,7 +1925,6 @@ source "board/hisilicon/hikey/Kconfig"
 source "board/hisilicon/hikey960/Kconfig"
 source "board/hisilicon/poplar/Kconfig"
 source "board/isee/igep003x/Kconfig"
-source "board/phytec/pcm051/Kconfig"
 source "board/silica/pengwyn/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
@@ -1932,5 +1950,3 @@ config SPL_LDSCRIPT
        default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK
        default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
        default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
-
-