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 F183AC636CC for ; Mon, 6 Feb 2023 00:57:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6D4385BA4; Mon, 6 Feb 2023 01:57:52 +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="DJ+7L0zr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6133285AEA; Mon, 6 Feb 2023 01:57:49 +0100 (CET) Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) (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 5A9AC85AC8 for ; Mon, 6 Feb 2023 01:57:45 +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-xd2d.google.com with SMTP id j4so3949941iog.8 for ; Sun, 05 Feb 2023 16:57:45 -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=1Yju/Os5+zYKINkRcfdNUKop8yrsJmQLAcjxas4KYgo=; b=DJ+7L0zrBssMeZQXORch2vJzDsXIB5fgsJHrZzTN/kmTWDb/vKP1GITwipzPvgAF+m eXjUn6Ao7cV05GpT3JfaRyJGoDIsAzFxQya4EmgMMsB5AvhOuMltG/2epBCRlhrHNzhJ hu0KCTaY5MPWp2O3nLTisrFROrDgN16pEtS4A= 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=1Yju/Os5+zYKINkRcfdNUKop8yrsJmQLAcjxas4KYgo=; b=afwt/kiZ3YQyvr1mgfqxXI9sQ3Hq9rcUpBG9SV5m4mL8qCx6Xn60XTsvRjnV1kxkFo Qm9yYVw3MtiJsYeWZIC8oG39NWuFsu7JMSdJwTMNmw8KKRIQ5kLpzWzBtmTnb6W6caOp h/Zq41knffQt922DI10t9A0nkZ42IWFdFq7C8IZuhrJOOjFCqTg1V2xDerNvp4bocnVk yD+RXWF4PgYBXopD5iZG1FIFamz5l5BRMmQgeeo4RkeIjGjHMxmeBrzDUbEEikhe6kJR EX0evTIpQ9iOpqm5QCZj9+XQXRAj5W903rMjGE6sSu0Erkn2DuGN+VnnNEu8n8zEFbo6 kj7w== X-Gm-Message-State: AO0yUKVFmBT5ZeM5u3PGrjHWeR44dBC2KF4LCFrj+VMKyptTNLYOQ7lJ 8b1TdPWY/OYlkBiXtAjSbhCD8CIvwlTZx8fr X-Google-Smtp-Source: AK7set+jzNk47spdnw8EsA6PbIx96/NX9IUvQmIUWYTgCGAblbK06B78PPqWDw9QUhSvDxeKqeHUfw== X-Received: by 2002:a6b:8d4d:0:b0:704:cfbe:ce90 with SMTP id p74-20020a6b8d4d000000b00704cfbece90mr11364988iod.7.1675645063980; Sun, 05 Feb 2023 16:57:43 -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 b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:57:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Matthias Brugger Subject: [PATCH v2 115/169] Correct SPL uses of OF_BOARD Date: Sun, 5 Feb 2023 17:54:42 -0700 Message-Id: <20230206005537.254541-116-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-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_OF_BOARD defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Matthias Brugger --- (no changes since v1) drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 2 +- drivers/serial/serial_bcm283x_pl011.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 44a310f83de..e949cb70900 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c @@ -153,7 +153,7 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = { .priv_auto = sizeof(struct bcm283x_pinctrl_priv), .ops = &bcm283x_pinctrl_ops, .probe = bcm283x_pinctl_probe, -#if CONFIG_IS_ENABLED(OF_BOARD) +#if IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 12cbcb9858c..7585f790d22 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -197,7 +197,7 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = { .plat_auto = sizeof(struct bcm283x_mu_serial_plat), .probe = bcm283x_mu_serial_probe, .ops = &bcm283x_mu_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif .priv_auto = sizeof(struct bcm283x_mu_priv), diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 7d172cdac0a..09a9868a38f 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -94,7 +94,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .probe = bcm283x_pl011_serial_probe, .plat_auto = sizeof(struct pl01x_serial_plat), .ops = &bcm283x_pl011_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif .priv_auto = sizeof(struct pl01x_priv), -- 2.39.1.519.gcb327c4b5f-goog