Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 161dee9..72aee8b 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -30,6 +30,12 @@ config ARMADA_38X
        select ARMADA_32BIT
        select HAVE_MVEBU_EFUSE
 
+config ARMADA_38X_HS_IMPEDANCE_THRESH
+       hex  "Armada 38x USB 2.0 High-Speed Impedance Threshold (0x0 - 0x7)"
+       depends on ARMADA_38X
+       default 0x6
+       range 0x0 0x7
+
 config ARMADA_XP
        bool
        select ARMADA_32BIT
@@ -165,8 +171,8 @@ config TARGET_DB_XC3_24G4XG
        bool "Support DB-XC3-24G4XG"
        select 98DX3336
 
-config TARGET_CRS305_1G_4S
-       bool "Support CRS305-1G-4S"
+config TARGET_CRS3XX_98DX3236
+       bool "Support CRS3XX-98DX3236"
        select 98DX3236
 
 endchoice
@@ -188,7 +194,7 @@ config SYS_BOARD
        default "a38x" if TARGET_CONTROLCENTERDC
        default "x530" if TARGET_X530
        default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
-       default "crs305-1g-4s" if TARGET_CRS305_1G_4S
+       default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
 
 config SYS_CONFIG_NAME
        default "clearfog" if TARGET_CLEARFOG
@@ -207,7 +213,7 @@ config SYS_CONFIG_NAME
        default "controlcenterdc" if TARGET_CONTROLCENTERDC
        default "x530" if TARGET_X530
        default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
-       default "crs305-1g-4s" if TARGET_CRS305_1G_4S
+       default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
 
 config SYS_VENDOR
        default "Marvell" if TARGET_DB_MV784MP_GP
@@ -225,20 +231,32 @@ config SYS_VENDOR
        default "CZ.NIC" if TARGET_TURRIS_MOX
        default "gdsys" if TARGET_CONTROLCENTERDC
        default "alliedtelesis" if TARGET_X530
-       default "mikrotik" if TARGET_CRS305_1G_4S
+       default "mikrotik" if TARGET_CRS3XX_98DX3236
 
 config SYS_SOC
        default "mvebu"
 
 choice
        prompt "Boot method"
+       depends on SPL
 
 config MVEBU_SPL_BOOT_DEVICE_SPI
        bool "SPI NOR flash"
+       imply ENV_IS_IN_SPI_FLASH
+       select SPL_DM_SPI
+       select SPL_SPI_FLASH_SUPPORT
+       select SPL_SPI_LOAD
+       select SPL_SPI_SUPPORT
 
 config MVEBU_SPL_BOOT_DEVICE_MMC
        bool "SDIO/MMC card"
+       imply ENV_IS_IN_MMC
+       # GPIO needed for eMMC/SD card presence detection
+       select SPL_DM_GPIO
+       select SPL_DM_MMC
+       select SPL_GPIO_SUPPORT
        select SPL_LIBDISK_SUPPORT
+       select SPL_MMC_SUPPORT
 
 config MVEBU_SPL_BOOT_DEVICE_SATA
        bool "SATA"