public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCHv3 02/10] Kconfig: Add SPI / SPI_FLASH as dependencies
Date: Wed, 29 May 2019 17:01:28 -0400	[thread overview]
Message-ID: <1559163696-8722-2-git-send-email-trini@konsulko.com> (raw)
In-Reply-To: <1559163696-8722-1-git-send-email-trini@konsulko.com>

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>
---
 arch/Kconfig | 2 ++
 cmd/Kconfig  | 3 +++
 env/Kconfig  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index e574b0d441b0..28afe3980168 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -101,6 +101,7 @@ config SANDBOX
 	imply CMD_IOTRACE
 	imply CMD_LZMADEC
 	imply CMD_SATA
+	imply CMD_SF
 	imply CMD_SF_TEST
 	imply CRC32_VERIFY
 	imply FAT_WRITE
@@ -147,6 +148,7 @@ config X86
 	imply CMD_IO
 	imply CMD_IRQ
 	imply CMD_PCI
+	imply CMD_SF
 	imply CMD_SF_TEST
 	imply CMD_ZBOOT
 	imply DM_ETH
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 0badcb3fe006..cda7931fe360 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1035,11 +1035,13 @@ config CMD_SDRAM
 
 config CMD_SF
 	bool "sf"
+	depends on DM_SPI_FLASH || SPI_FLASH
 	help
 	  SPI Flash support
 
 config CMD_SF_TEST
 	bool "sf test - Allow testing of SPI flash"
+	depends on CMD_SF
 	help
 	  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
@@ -1051,6 +1053,7 @@ config CMD_SF_TEST
 
 config CMD_SPI
 	bool "sspi - Command to access spi device"
+	depends on SPI
 	help
 	  SPI utility command.
 
diff --git a/env/Kconfig b/env/Kconfig
index 1e10c7a4c46b..932081670e9f 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -293,7 +293,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
-- 
2.7.4

  reply	other threads:[~2019-05-29 21:01 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-29 21:01 [U-Boot] [PATCHv3 01/10] arm: Remove zipitz2 board Tom Rini
2019-05-29 21:01 ` Tom Rini [this message]
2019-06-12  7:29   ` [U-Boot] [PATCHv3 02/10] Kconfig: Add SPI / SPI_FLASH as dependencies Jagan Teki
2019-05-29 21:01 ` [U-Boot] [PATCHv3 03/10] Kconfig: Add DEPRECATED option Tom Rini
2019-06-12  7:33   ` Jagan Teki
2019-06-12 13:38     ` Tom Rini
2019-06-12 15:45       ` Jagan Teki
2019-06-12 15:54         ` Tom Rini
2019-06-12 17:12           ` Jagan Teki
2019-05-29 21:01 ` [U-Boot] [PATCHv3 04/10] Makefile: Trigger a Warning if DEPRECATED is defined Tom Rini
2019-05-29 21:01 ` [U-Boot] [PATCHv3 05/10] Makefile: Trigger a warning for legcay spi drivers Tom Rini
2019-05-29 21:01 ` [U-Boot] [PATCHv3 06/10] spi: Kconfig: Mark MXS_SPI has DEPRECATED Tom Rini
2019-05-29 21:01 ` [U-Boot] [PATCHv3 07/10] spi: Kconfig: Mark SH_SPI as DEPRECATED Tom Rini
2019-05-29 21:01 ` [U-Boot] [PATCHv3 08/10] spi: Kconfig: Mark SOFT_SPI " Tom Rini
2019-05-29 21:01 ` [U-Boot] [PATCHv3 09/10] spi: Kconfig: Mark LPC32XX_SSP " Tom Rini
2019-05-29 21:01 ` [U-Boot] [PATCHv3 10/10] configs: Disable now unbuildable SPI options for boards Tom Rini
2019-05-29 21:33   ` Marek Vasut
2019-06-12  7:28   ` Jagan Teki
2019-05-29 22:27 ` [U-Boot] [PATCHv3 01/10] arm: Remove zipitz2 board Vasily Khoruzhick
2019-06-17  7:44 ` Jagan Teki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1559163696-8722-2-git-send-email-trini@konsulko.com \
    --to=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox