From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80270C433F5 for ; Tue, 24 May 2022 09:04:08 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 74ED6839AA; Tue, 24 May 2022 11:04:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="gnkwzGIS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5CEC9839AA; Tue, 24 May 2022 11:04:04 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A91B782105 for ; Tue, 24 May 2022 11:04:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5F91EB8172E; Tue, 24 May 2022 09:04:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E9B9C385AA; Tue, 24 May 2022 09:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653383039; bh=uY21cVqP2vy2AaKRGVHsqI97Swknxygim74/JCllibk=; h=From:To:Cc:Subject:Date:From; b=gnkwzGISEKSlfsBx347eI9NNt8aMDlKSQ9O2inTWD9khQsurFpvbBPg9WkUcxtXyH v7tQ0ywG/ZVsURE62dzlhUPYRAwcIp+oIuMnlKmyGt9XddkemdgW+7kgCquxrFMiJW FYU3XhYdrsQD5Bh40B8hdd140vQ0l/MUAsjpNgY03yr6gV1ydoKpC7T9+KF9/rHetQ CkT//tuMZczERVjURpjPtOYl9k6SzI/WpMYN7zUi5IEoeiOiypv/xWj5WznTQ1eg61 BIk3EJdAEJP6DFmwYYLbdhA1+emhhcZQKsDkHDqIVAIFzjhM9IUGk5WcLZ4NQ5A1Zr PC+fupIUzTUZA== Received: by pali.im (Postfix) id 2FBF09ED; Tue, 24 May 2022 11:03:56 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Simon Glass , Stefan Roese , Tom Rini Cc: u-boot@lists.denx.de Subject: [PATCH] TPL: Do not allow enabling TPL symbols for non-TPL builds Date: Tue, 24 May 2022 11:03:38 +0200 Message-Id: <20220524090338.8360-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean It does not make sense to enable TPL options when not building TPL binary. So disallow selecting TPL options for non-TPL builds. Signed-off-by: Pali Rohár --- common/Kconfig | 4 ++++ drivers/power/acpi_pmc/Kconfig | 1 + lib/Kconfig | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/Kconfig b/common/Kconfig index 8e59dcef4b8b..ba59edd14673 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -89,10 +89,14 @@ config SPL_LOGLEVEL endif +if TPL + config TPL_LOGLEVEL int default LOGLEVEL +endif + config VPL_LOGLEVEL int "loglevel for VPL" default LOGLEVEL diff --git a/drivers/power/acpi_pmc/Kconfig b/drivers/power/acpi_pmc/Kconfig index 8b712abc41e9..629acb071427 100644 --- a/drivers/power/acpi_pmc/Kconfig +++ b/drivers/power/acpi_pmc/Kconfig @@ -18,6 +18,7 @@ config SPL_ACPI_PMC config TPL_ACPI_PMC bool "Power Manager (x86 PMC) support in TPL" + depends on TPL default y if ACPI_PMC help Enable support for an x86-style power-management controller which diff --git a/lib/Kconfig b/lib/Kconfig index 299381ac80d5..ef1c57a075f6 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -249,6 +249,7 @@ config SPL_TINY_MEMSET config TPL_TINY_MEMSET bool "Use a very small memset() in TPL" + depends on TPL help The faster memset() is the arch-specific one (if available) enabled by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get @@ -779,7 +780,7 @@ config TPL_OF_LIBFDT config TPL_OF_LIBFDT_ASSUME_MASK hex "Mask of conditions to assume for libfdt" - depends on TPL_OF_LIBFDT || FIT + depends on TPL_OF_LIBFDT || (TPL && FIT) default 0xff help Use this to change the assumptions made by libfdt in TPL about the -- 2.20.1