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 EFEE6C636CC for ; Sun, 5 Feb 2023 23:03:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 694CB85CBB; Sun, 5 Feb 2023 23:56:09 +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="N7A+ViMk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E98085AB3; Sun, 5 Feb 2023 23:53:42 +0100 (CET) Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 EB0C085A01 for ; Sun, 5 Feb 2023 23:44:35 +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-x136.google.com with SMTP id z2so4118833ilq.2 for ; Sun, 05 Feb 2023 14:44:35 -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=s/NfSgjFCR5pFwdqW90DDQQidYtOrbImEta5Mm2dZW4=; b=N7A+ViMkzA3R9A/9JVvt1F4YnGoyR16HnKba7wUZvMDprZBvl/5lI7uF9NCK/CKMaF VIBTfhL83Ngemry4SNuYDd+kO6GpIOTFx2p8kDj4wdO8F6c3jBlRkSoF4JD+n8QDi8vq fgad91boOGihz7T+FAkdpipBmENHcvpbZRRkw= 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=s/NfSgjFCR5pFwdqW90DDQQidYtOrbImEta5Mm2dZW4=; b=Ip9gTbxzjSUdq92BifNn5Rp2Iqw7/14WoeKv7KE1xSo0zuwhFd9kTIgdARLwE7r7V1 sj6DLOwKgGSqTzNWiSNwjuBLKKcXzOCx8usnbdLknEI6q63YpGH3FYmw0gr17oVZS0Et a8118E3TtnjtK5Y1vnAR3QgohrXOF/N0QYI+gpb4yia0TELeoYA2bbQWWJM9/BE7FFps 8HHxijnnkTs/H5f5PS9/90qXvC2jqWJa2NHK3gnu4amLMBX5SU62n47QapRo6fKENPZH YjtoeBdIzLizd0i0KzyD3HcRji/yqG3ZPLaJN+JcgqdhHdx35VI/IWD+KyuqznXvFToA 0MXA== X-Gm-Message-State: AO0yUKXd5qsF3/WDpnCL0UyCig9rd0krkry28+3K/YI3MFIO1A+HDYsW HGznmrhlbPg6JfWJbBR2Pda0VwD1T/yklE1p X-Google-Smtp-Source: AK7set/I5/UD8b5ri1Dm+gdmhAZcoR+78k4IiYUOTZEkFbdeJ6M8m8/5xGqJR1i1KkQ+SjcqFBn49A== X-Received: by 2002:a05:6e02:1bcc:b0:310:ae72:32a0 with SMTP id x12-20020a056e021bcc00b00310ae7232a0mr16421359ilv.21.1675637023190; Sun, 05 Feb 2023 14:43: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 z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 144/169] Correct SPL use of STM32MP15X_STM32IMAGE Date: Sun, 5 Feb 2023 15:40:53 -0700 Message-Id: <20230205224118.233425-145-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 1 usage of this option to the non-SPL form, since there is no SPL_STM32MP15X_STM32IMAGE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-stm32mp/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c index 3b4c05d7451..de5c5a55ea0 100644 --- a/arch/arm/mach-stm32mp/fdt.c +++ b/arch/arm/mach-stm32mp/fdt.c @@ -505,7 +505,7 @@ int ft_system_setup(void *blob, struct bd_info *bd) * under CONFIG_STM32MP15x_STM32IMAGE only for compatibility * when FIP is not used by TF-A */ - if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) && + if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE) && !tee_find_device(NULL, NULL, NULL, NULL)) stm32_fdt_disable_optee(blob); } -- 2.39.1.519.gcb327c4b5f-goog