Message ID | 20230130151612.212732-141-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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=XbwxkgAK; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4P5CVg00b3z1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:57:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C143D859EF; Mon, 30 Jan 2023 16:56:31 +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="XbwxkgAK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80AA8844AE; Mon, 30 Jan 2023 16:55:49 +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-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 A78BF859B9 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:19:05 +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-x12f.google.com with SMTP id u7so3698541ilg.4 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:19:05 -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=yAHmakSlhfMlLLvrNvnFAJs/nGH85uYpFbh9eQ69rLs=; b=XbwxkgAKkX7deqUVZ/d7JEwNEpQXwwLDEdXX9wkzlMghqZILSPR5x7PTnkaJY4W8ZH pB+ASBGKCoPgbgRjaFFKvcyxJkAasrhSX844ljdGfLk4tFwilb6xGg1h/7PRV7PMeUy2 yzh9fEQxyxsJ4g1cWq0cMsAeYj9JFLeHi883I= 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=yAHmakSlhfMlLLvrNvnFAJs/nGH85uYpFbh9eQ69rLs=; b=v8+pQkJ0gz9hbKRR+vReQPiKUIrR6qQnSUcZCOF3zsIgVCzlQhiGJTvzkN0gdthb8+ EIc4U+iid4XTHQKJ1a4HPpEtAODeONJe8c+dGiJo5dk8PpfzINr0drh3WpYzKLO02A6B ygX0pa446zTFb9vPT90MU821KTU0JF0+//fDH1vKPAoeV1j2K6sMr2zmR/stAx2ypd0+ rDwgUJ6r+SjT/A9tgjFyyiocre8ngakhWknhChxz6FdZ0RLKSY/0iP4tA52RhYuUMoxK jFKgHInUxJ7z++FqCkZE7nupa6ZdzMKMU8zX6RwHxi7LowF0vWmgL0TxfW56B5MxTmiO OiLg== X-Gm-Message-State: AO0yUKX3yJ5ByHLgc/bcIuHehUrsuXRaNy4folAi/C8eCN80BoQ6ftVQ 717AiT+jSrL51de0qScur0Gi+XCvk72qYDmZ X-Google-Smtp-Source: AK7set8bdnf54xzgh/R97dCmdV/HN+yM8+6UyreOgehkndAoKu85ZzDZXcul8tYhlvHUc+Kx7XEzpg== X-Received: by 2002:a05:6e02:1889:b0:310:36d8:79a8 with SMTP id o9-20020a056e02188900b0031036d879a8mr7914244ilu.17.1675091872771; Mon, 30 Jan 2023 07:17:52 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:52 -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>, Anup Patel <anup@brainfault.org>, Atish Patra <atishp@atishpatra.org>, Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul.walmsley@sifive.com> Subject: [PATCH 140/171] Correct SPL uses of SIFIVE_OTP Date: Mon, 30 Jan 2023 08:15:41 -0700 Message-Id: <20230130151612.212732-141-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/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c index f8aad862c6d..b6ab06a08fb 100644 --- a/board/sifive/unleashed/unleashed.c +++ b/board/sifive/unleashed/unleashed.c @@ -27,7 +27,7 @@ #ifdef CONFIG_MISC_INIT_R -#if CONFIG_IS_ENABLED(SIFIVE_OTP) +#if IS_ENABLED(CONFIG_SIFIVE_OTP) static u32 otp_read_serialnum(struct udevice *dev) { int ret; @@ -53,7 +53,7 @@ static u32 fu540_read_serialnum(void) { u32 serial = ERROR_READING_SERIAL_NUMBER; -#if CONFIG_IS_ENABLED(SIFIVE_OTP) +#if IS_ENABLED(CONFIG_SIFIVE_OTP) struct udevice *dev; int ret;
This converts 2 usages of this option to the non-SPL form, since there is no SPL_SIFIVE_OTP defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- board/sifive/unleashed/unleashed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)