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 D077CC636CD for ; Mon, 6 Feb 2023 01:00:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 21E7885C81; Mon, 6 Feb 2023 01:58:21 +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="mm7i3Wd9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87D9085C88; Mon, 6 Feb 2023 01:58:12 +0100 (CET) Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (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 D704F85C52 for ; Mon, 6 Feb 2023 01:58:08 +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-xd30.google.com with SMTP id w24so3939924iow.13 for ; Sun, 05 Feb 2023 16:58:08 -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=4Ts+nNSuEGjgSkjcLBjQQ4QhxIzlUds9VBY0bQQT4To=; b=mm7i3Wd9dFJ86ku2C+pY1ivalzgofC8ZHyEDcWiQTaMMBHkUR6neA7F+0WxBEGExfY ZtwIuyWnQ3LHVtY5GnkhI+oy0JjhzwJg+o30xS/wu5ug0zb6S1rXarahHWiG+d8hJajV +g56tiSL4W/xPhg0prn2U7MllFeVYGVDXo8Jw= 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=4Ts+nNSuEGjgSkjcLBjQQ4QhxIzlUds9VBY0bQQT4To=; b=OxskiUHexSkD8WCVhrdUTlovd/YeQm1VO1TkgbRKk8dwzU2HTgl7dmFvOz3lnoG6su KjoIixLUeHGGnWWONlfk2bdDX0u51FmATWz3m0GUBocuBTJlcwOyyCIMdi2BJ6mvmK+C rnR7GLJVyO7JNwvpKvJKoNdOcJdGbzeBKClxfcfjyKLUOUYzo6kXMJhJqJH6hy3oO25L S5P992HB2vNUhDq1C+U3L/tUOdL3vWBHgEUvhC36bUTGpv3bfYrbWfbg1pgaxcZ52uJ5 84wofMGKuapTszHQBsBfemUg6bxbJJqWLB+IpfIFMWZiDxs79UZVYn17Izh871FFML2i +EkQ== X-Gm-Message-State: AO0yUKUjdUbLCwIYNPEojitk9KmB+IdwuSiYLFtE8OKBVG+rubTEhDvd RaCXNCBDP4cnbcscInySs+gBwjVU8ndlQhmJ X-Google-Smtp-Source: AK7set8n233EGAyVz+V9Zr/qGjsXZvga8NijZqe2WGucQIKuRLQW477cs4cB4L4sF4m9zf3msPmF6g== X-Received: by 2002:a6b:fd09:0:b0:71b:cc7b:db4f with SMTP id c9-20020a6bfd09000000b0071bcc7bdb4fmr12516031ioi.12.1675645087491; Sun, 05 Feb 2023 16:58:07 -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.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:58:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 137/169] Correct SPL uses of SEC_FIRMWARE_ARMV8_PSCI Date: Sun, 5 Feb 2023 17:55:04 -0700 Message-Id: <20230206005537.254541-138-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 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 --- (no changes since v1) arch/arm/cpu/armv8/cpu-dt.c | 2 +- arch/arm/lib/bootm-fdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; -- 2.39.1.519.gcb327c4b5f-goog