From patchwork Tue Oct 22 20:05:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1181654 X-Patchwork-Delegate: jagannadh.teki@gmail.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="LwWXVmlw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46yPdJ12yLz9sP6 for ; Wed, 23 Oct 2019 07:05:40 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BE9FBC21DB6; Tue, 22 Oct 2019 20:05:35 +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 F2076C21D8E; Tue, 22 Oct 2019 20:05:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 28365C21D8E; Tue, 22 Oct 2019 20:05:33 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id C32B8C21D4A for ; Tue, 22 Oct 2019 20:05:32 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id r141so7769990wme.4 for ; Tue, 22 Oct 2019 13:05:32 -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=c8uwj0oMzcO8dZnMMccXD4OEOqbI50x6J4xDT9hZr7s=; b=LwWXVmlwRYv0PICFYiDmhOvDcUpuXfHMDi4ZHYLiLSDAgMJxWupMwK1aqOw1BdSW/9 a97lkSNpVrKTUOxaj6TAZmmxR0NwnlkS2bU7ldNKnfUgtyM5PwfRWCwEtIO8n8hIuWmH M8HsQYGm9Rq/2hsOx5ruCCcl8g59aEyPx7dsIv4/gAtc8xM0Qksjr0DEw6GxT7VjPct3 4YDlAYW9W5BxAOqX+GP5SsBjpMQ+WtavGSHy0QiV9CkyIulsTCY8bszDeVK2WwDIMCkn 3SKrN4gjo3yI7b7sdmhZYsrZ4ER0nQyZ5XmZCx9NTMYEwzZAgi27f33xMXxISrtTZgAz SfFw== 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=c8uwj0oMzcO8dZnMMccXD4OEOqbI50x6J4xDT9hZr7s=; b=CEBfcDqStSUVTYE5Nllmsey0vd3agI50Yf0jnNrMxAzuE5T0E9TmWPFtPdcNEIgjk5 zMFhADEkTJGEksv0LqAca5E/fHETAnlqRovx5TgAsyktNknYU7Hcg9WOwj/gmxjHsLMB IGM1faSYVVtoqz+pygpmwT5uanGFRMhdoUqVhvBpa7mnaJQ28tGBHo62IP4d0EK4Ax2f QPEMEcq3Q4XyY2y+U11cJg4U/nMfBn/iHyVYX38lih8XfWH6VhlBBodbtc1eN+89qu0d QSNHq8sbAj/9NC7rDCo9wk+hzHKySJL/1ukWRwBJe7+0vN0VRvi1v2UE07ZYT8tvopIA n81A== X-Gm-Message-State: APjAAAVc8K0hC2dbtnIEYrdFLGSrXEcjbjU25/mdmICEjS/rFvWZ999W 4clIxKLfzb6XoXAQoN1xSEw= X-Google-Smtp-Source: APXvYqwtd8q9FnDA28mDqNwUDl78NdellYwb39PPWEMpAwugEemjvKVgfFCUN7csBrLdKe4fyWTCKw== X-Received: by 2002:a05:600c:294c:: with SMTP id n12mr4227159wmd.99.1571774732341; Tue, 22 Oct 2019 13:05:32 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:50e:1b2d:a4c8:d388]) by smtp.gmail.com with ESMTPSA id g69sm6544673wme.31.2019.10.22.13.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 13:05:31 -0700 (PDT) From: Simon Goldschmidt To: Tom Rini Date: Tue, 22 Oct 2019 22:05:22 +0200 Message-Id: <20191022200522.6206-1-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: Tien Fong Chee , u-boot@lists.denx.de Subject: [U-Boot] [PATCH] 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. Also SYS_SPI_U_BOOT_OFFS does not make sense without SPL_SPI_FLASH_SUPPORT enabled, so move it into its 'if' section. Signed-off-by: Simon Goldschmidt --- common/spl/Kconfig | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 86d7edfee1..322b323f09 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 @@ -1050,8 +1061,6 @@ config SPL_SPI_LOAD Enable support for loading next stage, U-Boot or otherwise, from SPI NOR in U-Boot SPL. -endif # SPL_SPI_FLASH_SUPPORT - config SYS_SPI_U_BOOT_OFFS hex "address of u-boot payload in SPI flash" default 0x0 @@ -1060,15 +1069,7 @@ 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. +endif # SPL_SPI_FLASH_SUPPORT config SPL_THERMAL bool "Driver support for thermal devices"