Message ID | 20230130151612.212732-140-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=JHVv6BsM; 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 4P5C7X3q3cz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:40:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5506C859BF; Mon, 30 Jan 2023 16:27: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=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="JHVv6BsM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1524A8593F; Mon, 30 Jan 2023 16:25:46 +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-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 035AF859B2 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:19:03 +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-xd2a.google.com with SMTP id r6so2057143ioj.5 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:19:03 -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=nhXlWpt8HdeAI6+ysPaEwMi/gnQtMDLQzYjFSvT2Byo=; b=JHVv6BsM0zX7JBmIlwfkkMUthavReAGuilHxhEJ9OAGApTbDxklj4HFxMqsWfDjPei ZbuH+8XhxkxtDboQQG44h19C0gaI4Vf9KB4wUZ328X4Lni/DdrxMYb9vbVhw3a9HY8/H AFGOuSneJb/rIqcdIiC9yW4OQwEJ/DP99QUa4= 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=nhXlWpt8HdeAI6+ysPaEwMi/gnQtMDLQzYjFSvT2Byo=; b=znv4mNVuf6f6Luv5QUi8IPBv+mLDJ6PP/StkspQapjQ5OGa7o0oNkg3zINafOq8K9b ko0NQcG3Fhm+tBLpNTstG7JTrlu/a9b1kU5XRzbiZfjdhSSkMBLD9T5vBOcmFvzac0Ph K7ITLtsUkBHXvPmbMWsE1Rf1BZFy/sxui8jBGgXehhNA3Yzc1W4owJTCrASIurd42jUD DS5YDYUvriwVIfQjxFWkYNs+pU38sSUTDSbURtnPRzk1UXig1rw8Y+5qPfu07/urkVS8 uL35UYlhK6MUpKL080U4K8IHl3NW+H7vKYrYFn/kIWizfZqRD3la7nqiVOPn01m08QfN 1s1g== X-Gm-Message-State: AO0yUKUiZfMU1nnLmuuvnVOjhdYt/2r0TPeR7iESeFQctvw2PrfGa1pa eNJ//rtSvZG/TMSxpi3qBXWnK3Ejo81mz/Ch X-Google-Smtp-Source: AK7set9erocvav4+5MQZnuCRdSwbmeVSQElap9A23RAQbv2Qn9HZ8PlRnRaEF2XIuSysTTEtHdD5oA== X-Received: by 2002:a5d:9590:0:b0:715:bb52:f86f with SMTP id a16-20020a5d9590000000b00715bb52f86fmr5900260ioo.5.1675091871787; Mon, 30 Jan 2023 07:17:51 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:51 -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>, Michael Walle <michael@walle.cc>, Priyanka Jain <priyanka.jain@nxp.com> Subject: [PATCH 139/171] Correct SPL uses of SEC_FIRMWARE_ARMV8_PSCI Date: Mon, 30 Jan 2023 08:15:40 -0700 Message-Id: <20230130151612.212732-140-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/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c index 9bfe3815e51..afb2dd6c5b6 100644 --- a/arch/arm/cpu/armv8/cpu-dt.c +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -18,7 +18,7 @@ __weak int psci_update_dt(void *fdt) * number to support detecting PSCI dynamically and then switching * the SMP boot method between PSCI and spin-table. */ - if (CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) && + if (IS_ENABLED(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) && sec_firmware_support_psci_version() == PSCI_INVALID_VER) return 0; diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 29020bd1c6b..69e688f677f 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -64,7 +64,7 @@ int arch_fixup_fdt(void *blob) #endif #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \ - CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) + IS_ENABLED(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) ret = psci_update_dt(blob); if (ret) return ret;
This converts 2 usages of this option to the non-SPL form, since there is no SPL_SEC_FIRMWARE_ARMV8_PSCI defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/cpu/armv8/cpu-dt.c | 2 +- arch/arm/lib/bootm-fdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)