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 E4919C61DA4 for ; Wed, 22 Feb 2023 16:50:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6856A85C03; Wed, 22 Feb 2023 17:45:51 +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="ewrEk7hW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 976FA85B37; Wed, 22 Feb 2023 17:44:07 +0100 (CET) Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 5A55285630 for ; Wed, 22 Feb 2023 17:34:49 +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-io1-xd33.google.com with SMTP id b16so2814837iof.11 for ; Wed, 22 Feb 2023 08:34:49 -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=VtEye8qD2qWuj4gsBsoy4ITJBP3ZD2L06PgoI4aBJKU=; b=ewrEk7hWl6GsM4HP5Ukymn07Uxhup0l8UL/s50f1Rbx9dxx/FXTtnUNwBf11NJHgk1 o+u+L8IVBgdcsX347/M7iIbNygXMgmJm7pDWz2Kmh5lfChU97xyQTZbVeBr0vwtL34M1 fiwy2XDc7MRYak/pkW3OpNG6n4JUOpV9EOYlc= 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=VtEye8qD2qWuj4gsBsoy4ITJBP3ZD2L06PgoI4aBJKU=; b=rtpIEDxYEqduWFYt2UJa52yAUjl9oLiiPriJWvR6hnGenes38DdzWbj05FlFyFv43l 2rRKxvuBL9+sNIj1wpVriDRW7Y9zQcJ97Y46hrlg6Otor5rQzmVBU9V5AfUOd3nzY3ll O5LOXdozqhGe8hham5t0p9t0YfE0vD7q8Kna4o3Zsm/z+wLE0qdm2uQZNq/wx1lSqVqT 3UTFjc+7XvSz+ZDajLGxafdZRnTxgpUFP6jV15grtMcwodJz0D6S3M6Rb+Ct9wkIDjrP jz90NvnKu3vxfOBXBtnM1yQA8LVnH/rWylreBliR+aZIxFSaMpapOa6RYy+HJuGs6MQJ Tnvw== X-Gm-Message-State: AO0yUKWL/GGoU6ErkanKGugJq7SsJUARwgoqzX4LKvH4/gPcMMODa5ay +xbMrRxhpOYBj6bGnsTYRBN3YMYa956hnbXv X-Google-Smtp-Source: AK7set/nJK4MeR77wB/cJM7JLN2enixZ+Lf520s3VXmOvu0Intgg3CFkvRwxR+2bPoREUzdTIkO9mQ== X-Received: by 2002:a5d:9306:0:b0:71a:1b72:5afc with SMTP id l6-20020a5d9306000000b0071a1b725afcmr1019600ion.19.1677083687962; Wed, 22 Feb 2023 08:34:47 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z26-20020a056602005a00b00716eb44b97esm2164541ioz.27.2023.02.22.08.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 08:34:47 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andrew Scull , Balamanikandan Gunasundar , Jaehoon Chung , Paul Barker , Sughosh Ganu , Ye Li Subject: [PATCH v5 08/44] Correct SPL uses of MULTIPLEXER Date: Wed, 22 Feb 2023 09:33:49 -0700 Message-Id: <20230222163425.2043934-9-sjg@chromium.org> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog In-Reply-To: <20230222163425.2043934-1-sjg@chromium.org> References: <20230222163425.2043934-1-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 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.6 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Tom Rini --- (no changes since v3) Changes in v3: - Move the option down to the non-SPL part of drivers/Makefile drivers/Makefile | 2 +- drivers/mux/Makefile | 2 +- include/mux.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index 15d19d0c8a3..58be410135d 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -18,7 +18,6 @@ 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_$(SPL_TPL_)ETH) += net/ obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/ obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/ @@ -87,6 +86,7 @@ obj-$(CONFIG_FASTBOOT) += fastboot/ obj-$(CONFIG_FWU_MDATA) += fwu-mdata/ obj-y += misc/ obj-$(CONFIG_MMC) += mmc/ +obj-$(CONFIG_MULTIPLEXER) += mux/ obj-$(CONFIG_NVME) += nvme/ obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/ obj-y += dfu/ 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 -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. -- 2.39.2.637.g21b0678d19-goog