Kconfig: Add SPI / SPI_FLASH as dependencies

In order to use CMD_SF / CMD_SPI / ENV_IS_IN_SPI_FLASH we need to have
the SPI (or SPI_FLASH/DM_SPI_FLASH, for CMD_SF) enabled.  Express this
in the Kconfigs.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Tom Rini 2019-05-29 17:01:28 -04:00 committed by Jagan Teki
parent 9a4b90015a
commit a4298ddaf8
3 changed files with 6 additions and 1 deletions

View File

@ -101,6 +101,7 @@ config SANDBOX
imply CMD_IOTRACE imply CMD_IOTRACE
imply CMD_LZMADEC imply CMD_LZMADEC
imply CMD_SATA imply CMD_SATA
imply CMD_SF
imply CMD_SF_TEST imply CMD_SF_TEST
imply CRC32_VERIFY imply CRC32_VERIFY
imply FAT_WRITE imply FAT_WRITE
@ -147,6 +148,7 @@ config X86
imply CMD_IO imply CMD_IO
imply CMD_IRQ imply CMD_IRQ
imply CMD_PCI imply CMD_PCI
imply CMD_SF
imply CMD_SF_TEST imply CMD_SF_TEST
imply CMD_ZBOOT imply CMD_ZBOOT
imply DM_ETH imply DM_ETH

View File

@ -1035,11 +1035,13 @@ config CMD_SDRAM
config CMD_SF config CMD_SF
bool "sf" bool "sf"
depends on DM_SPI_FLASH || SPI_FLASH
help help
SPI Flash support SPI Flash support
config CMD_SF_TEST config CMD_SF_TEST
bool "sf test - Allow testing of SPI flash" bool "sf test - Allow testing of SPI flash"
depends on CMD_SF
help help
Provides a way to test that SPI flash is working correctly. The Provides a way to test that SPI flash is working correctly. The
test is destructive, in that an area of SPI flash must be provided test is destructive, in that an area of SPI flash must be provided
@ -1051,6 +1053,7 @@ config CMD_SF_TEST
config CMD_SPI config CMD_SPI
bool "sspi - Command to access spi device" bool "sspi - Command to access spi device"
depends on SPI
help help
SPI utility command. SPI utility command.

2
env/Kconfig vendored
View File

@ -293,7 +293,7 @@ config ENV_IS_IN_REMOTE
config ENV_IS_IN_SPI_FLASH config ENV_IS_IN_SPI_FLASH
bool "Environment is in SPI flash" bool "Environment is in SPI flash"
depends on !CHAIN_OF_TRUST depends on !CHAIN_OF_TRUST && SPI
default y if ARMADA_XP default y if ARMADA_XP
default y if INTEL_BAYTRAIL default y if INTEL_BAYTRAIL
default y if INTEL_BRASWELL default y if INTEL_BRASWELL