diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-17 11:32:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-17 11:32:22 -0400 |
| commit | c3f43185eeb9e600c6cc0e7721f52c749e14c666 (patch) | |
| tree | b79e54432f4da8bc868c411791a704d8c4a2cb19 /env | |
| parent | c3e8aa1a9ed5f6db7345b23a2f8f136e987ebd4d (diff) | |
| parent | 88369d33e322e0cdfbb1f0c33021ad424578619e (diff) | |
| download | u-boot-c3f43185eeb9e600c6cc0e7721f52c749e14c666.tar.gz u-boot-c3f43185eeb9e600c6cc0e7721f52c749e14c666.tar.bz2 u-boot-c3f43185eeb9e600c6cc0e7721f52c749e14c666.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
- Drop zipitz2 board (Tom)
- Add DEPRECATED option (Tom)
- Mark legacy or non-dm drivers as DEPRECATED (Jagan)
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/env/Kconfig b/env/Kconfig index 5651685c15..b9439171fd 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -287,7 +287,7 @@ config ENV_IS_IN_REMOTE config ENV_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 INTEL_BAYTRAIL default y if INTEL_BRASWELL |