From patchwork Fri Oct 25 14:22:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1184207 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mWurbb+F"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 4705t463lCz9sPK for ; Sat, 26 Oct 2019 01:22:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0D326C21E0B; Fri, 25 Oct 2019 14:22:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A8E89C21C57; Fri, 25 Oct 2019 14:22:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E9A40C21C57; Fri, 25 Oct 2019 14:22:16 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 1B205C21C51 for ; Fri, 25 Oct 2019 14:22:15 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id o28so2549739wro.7 for ; Fri, 25 Oct 2019 07:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Te5yp4+BG1/hNNiUeDYZ5pMuTFcgrTsQC4X55+OGCOc=; b=mWurbb+FAHx7zyD+EGPvLpPkEy8C+JbrYbs7pKWIChapEubMol8wyuFb565MSwHbeP HAdiD7NBsXe277Na7LHnjLsI5r1gRI/aMqXWuXvCZ4jZ9+I55PvJM2VXzATdlicvzyaD Yrqn7NeFAeaz/gipjHy6C/L24kbvV0sGG2mU4dw6MHUnNB0Hr6oIA2LR2BOGl/22mVxc 52izRji2CNgLe0cxu/hAIIIDrVGJ+CXpYdBx8lYkKFd7l6S8/z0OKQDBAreTTrdtyCxr BX30btBfGuNTp40T/I7RA+x571oIO2rfSAuWblgqvZeMWnPxYDpTr7QQHeVtOuwJTjOz gyjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Te5yp4+BG1/hNNiUeDYZ5pMuTFcgrTsQC4X55+OGCOc=; b=M0uHpNREGUgSe3po46I7pFT6m8u4sSLUz/tdPu+4hJztrvmVAYXgGHtNRltU+un7C5 wmLOsPROL8VPORCw+7536R7Hz1Q5hg39ahRATlak4f+Tb2YJ2cRSFXxAXlFRF0whzkxA ZhpaBLNenOR0OpW73QO0DXmZA9MZUNG50DfpR2qtLLzBfwAByOH395JzUJkskSvX/UWt xqcY2mhARyrCndH11xrHOW1v3R9No5PbbxgsqaX/UIGE7be18qdO+8k6bd0fcgrQa77n OOq2JA87A/oq5FEePMU/gJT3vhjoLo0Pll8+/L6xuXs9/MNyOOI5d5bgM9+1XVJR4aCp nZkQ== X-Gm-Message-State: APjAAAXuprL4KwCOqe4e9P5YqcGyH93xf25HXQS74KZ7g05osVOOkERs 1HSjFqms+duZLfCj50XWEmA= X-Google-Smtp-Source: APXvYqykhpJzSt1elcPwN/T1x8ewcuQNsrR6hTs7FKWYBpxaICOP/TPl5PR5nFQl8bEk7XwhybMFtQ== X-Received: by 2002:a5d:54c7:: with SMTP id x7mr3129803wrv.99.1572013334658; Fri, 25 Oct 2019 07:22:14 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:50e:1b2d:a4c8:d388]) by smtp.gmail.com with ESMTPSA id u1sm2375799wrp.56.2019.10.25.07.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 07:22:13 -0700 (PDT) From: Simon Goldschmidt To: Jagan Teki Date: Fri, 25 Oct 2019 16:22:09 +0200 Message-Id: <20191025142209.3838-1-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: Tom Rini , Tien Fong Chee , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2] spl: fix SPI config dependencies X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" As SPL_SPI_FLASH_SUPPORT cannot work without SPL_SPI_SUPPORT, fix dependencies to prevent enabling SPI flash support without basic SPI support. Signed-off-by: Simon Goldschmidt Reviewed-by: Lukasz Majewski --- Changes in v2: - move SYS_SPI_U_BOOT_OFFS out of the SPL_SPI_FLASH_SUPPORT guard since that broke sunxi SPL (which uses non-DM spi) common/spl/Kconfig | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 86d7edfee1..b8d234eb5e 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1014,8 +1014,19 @@ config SPL_SERIAL_SUPPORT unless there are space reasons not to. Even then, consider enabling SPL_USE_TINY_PRINTF which is a small printf() version. +config SPL_SPI_SUPPORT + bool "Support SPI drivers" + help + Enable support for using SPI in SPL. This is used for connecting + to SPI flash for loading U-Boot. See SPL_SPI_FLASH_SUPPORT for + more details on that. The SPI driver provides the transport for + data between the SPI flash and the CPU. This option can be used to + enable SPI drivers that are needed for other purposes also, such + as a SPI PMIC. + config SPL_SPI_FLASH_SUPPORT bool "Support SPI flash drivers" + depends on SPL_SPI_SUPPORT help Enable support for using SPI flash in SPL, and loading U-Boot from SPI flash. SPI flash (Serial Peripheral Bus flash) is named after @@ -1060,16 +1071,6 @@ config SYS_SPI_U_BOOT_OFFS Address within SPI-Flash from where the u-boot payload is fetched from. -config SPL_SPI_SUPPORT - bool "Support SPI drivers" - help - Enable support for using SPI in SPL. This is used for connecting - to SPI flash for loading U-Boot. See SPL_SPI_FLASH_SUPPORT for - more details on that. The SPI driver provides the transport for - data between the SPI flash and the CPU. This option can be used to - enable SPI drivers that are needed for other purposes also, such - as a SPI PMIC. - config SPL_THERMAL bool "Driver support for thermal devices" help