| Message ID | 20230130151612.212732-112-sjg@chromium.org |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=AsK0blmU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5CTp56QGz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:56:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 506AD8597C; Mon, 30 Jan 2023 16:56:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="AsK0blmU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 52F14859A3; Mon, 30 Jan 2023 16:55:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EF42585977 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:17:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id h18so2449771ilj.6 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:17:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o2RmXH+vB8vErWzXwXcFbWdt4VwWo00AtMvFQvB/r6I=; b=AsK0blmUJN+mcicb7mXVRnfy0ReZgz+X6KZuH+SvcSLyaOlGzZWKbJ72/3AKSzu5qS S8NwnTYrq+IdIfEpyZ9sW4lt4WAlGGSK7ZN3jc+z1XRPLBJ6pVXamx+b1G7BwyPvCO4n kLXvzktD3VhpnBD4Eww5R0Ivq5arWbzzCUm1Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o2RmXH+vB8vErWzXwXcFbWdt4VwWo00AtMvFQvB/r6I=; b=YnFIrvP5uMlWJGS81Zw88bRinUc0qnj7b7CdD4fkQ6T6IZ11B3BhnJLYT3JAsk6ojG BdpA+4Xkl6fqUHWRMcNrEdAot/otbA/+xNYtb9VRfkHGgpd0nKNkYTPN3E7RTGWrzFqP tAnvdW9U0SsOoQYhvtWuVZAI2eWX0qbOzlyAUcWeCpx1c1OoJcoSn4VXz+htKerZWdbi uxhUtjoilRH4q8RfvAmPixB6vC6Jfd/O3ty6nsVSAGZ540lvpfNpB20WWKfoBtN6t1MN iXMKrbFaZa3WqAWmjNBj96gWDZQwKbCznFbIa6dPbMhoN9F6OkhXbe02HuG0VonKF0xX LIWQ== X-Gm-Message-State: AO0yUKVgsbRaQg1oPsofrPvgO/JI8ITkufUEMDE+Xggy+3AF94jCEs3q GZMgQgWi9ZkwRrNR59fLGNgfNDdzvffjUV7A X-Google-Smtp-Source: AK7set/XJum7WsvQUgWwV+sIu6RiTUE4EK/8G32e3BBDtZUNOxNLkoGaM12eE7fYhkBG0napW7cOxg== X-Received: by 2002:a92:7a0d:0:b0:310:ecec:40cd with SMTP id v13-20020a927a0d000000b00310ecec40cdmr3308120ilc.14.1675091836135; Mon, 30 Jan 2023 07:17:16 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:15 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Andrew Scull <ascull@google.com>, Balamanikandan Gunasundar <balamanikandan.gunasundar@microchip.com>, Paul Barker <paul.barker@sancloud.com>, Sughosh Ganu <sughosh.ganu@linaro.org>, Ye Li <ye.li@nxp.com> Subject: [PATCH 111/171] Correct SPL uses of MULTIPLEXER Date: Mon, 30 Jan 2023 08:15:12 -0700 Message-Id: <20230130151612.212732-112-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
| Series |
None
|
expand
|
diff --git a/drivers/Makefile b/drivers/Makefile index 15d19d0c8a3..20497aa2ac9 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_$(SPL_TPL_)INPUT) += input/ obj-$(CONFIG_$(SPL_TPL_)LED) += led/ obj-$(CONFIG_$(SPL_TPL_)MMC) += mmc/ obj-y += mtd/ -obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux/ +obj-$(CONFIG_MULTIPLEXER) += mux/ obj-$(CONFIG_$(SPL_TPL_)ETH) += net/ obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/ obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/ diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile index 78ebf04c7a9..d4e24789d33 100644 --- a/drivers/mux/Makefile +++ b/drivers/mux/Makefile @@ -3,5 +3,5 @@ # (C) Copyright 2019 # Jean-Jacques Hiblot <jjhiblot@ti.com> -obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux-uclass.o +obj-$(CONFIG_MULTIPLEXER) += mux-uclass.o obj-$(CONFIG_$(SPL_)MUX_MMIO) += mmio.o diff --git a/include/mux.h b/include/mux.h index 9f809912742..c92d887591e 100644 --- a/include/mux.h +++ b/include/mux.h @@ -23,7 +23,7 @@ struct udevice; struct mux_control; -#if CONFIG_IS_ENABLED(MULTIPLEXER) +#if IS_ENABLED(CONFIG_MULTIPLEXER) /** * mux_control_states() - Query the number of multiplexer states. * @mux: The mux-control to query.
This converts 3 usages of this option to the non-SPL form, since there is no SPL_MULTIPLEXER defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/Makefile | 2 +- drivers/mux/Makefile | 2 +- include/mux.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)