From patchwork Mon Jan 30 15:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734207 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=c5mhqzZH; 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 4P5BxV4DDLz23hg for ; Tue, 31 Jan 2023 02:31:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E414F8599D; Mon, 30 Jan 2023 16:25:38 +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="c5mhqzZH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A12D9857A3; Mon, 30 Jan 2023 16:19:27 +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-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 01647859C8 for ; Mon, 30 Jan 2023 16:19:06 +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-x12e.google.com with SMTP id k12so193194ilv.10 for ; Mon, 30 Jan 2023 07:19:06 -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=gDoOh0Zs1aplwts5VnMq76uHdzkMThwMgUr9BKa/G7k=; b=c5mhqzZH5DnbUIgU/0/NdxS2coIZKGgefcze9I2Rbzgmq+mj3EJegrWw6p2KRtWvvR ZbHTFUc8vV8ivU2OkIL2eeeFz1aFHCpfyGdkxAbnRrJxrHNoXtU6Y5EUhy1j+io+6ku7 OV19UF+dsGcEM1dkoWZm4AHfsUpVVkYN+tVIU= 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=gDoOh0Zs1aplwts5VnMq76uHdzkMThwMgUr9BKa/G7k=; b=2HMAJI6UPk4Fpgx9/PBjc/MgOinM7IOyinbYSa6xoW4TTCaBFT6TPYCMgNH/7WIOo2 2JsTZtVCJLbCyyzG25gWaukrXvdhQ9iZ5Q4PvfJjPIqnK8MGpTsUX/fBHwdRRqxSMNPl sDhqkaY6gIX/M60+kUOdLqNPRgAWtinYAvq9jid4y6sashrrlJZxfd/Fg0uQJC96xWUK S5rQ4AcWuOfTRX71SS3djQsNqIPwNE7Op3H2NyocaX6ppr91ceLOUcfXdd4e8fDWjwah 8ArVZdZiuTasVB59v37XWs5KLSagB+r/p+Re3cpplMuqv0iINa+OhU4uipdB/4oe9sbh FGtw== X-Gm-Message-State: AFqh2koI7ubplF6Ae2K/2W70xWZ667RCCl9Ku3WGgzfpkuFHGE987Wni EuwPeW4NVVBhdbPVS9jd+KLZc+YaourYH6fB X-Google-Smtp-Source: AMrXdXszr10qYq5IjkeUYQAzy69IbTKC62Q/uSEV1EsEyRPK4OxruKXrbLjO8SYPaBtGi6tRDibJkA== X-Received: by 2002:a05:6e02:1a0b:b0:30f:526d:3e31 with SMTP id s11-20020a056e021a0b00b0030f526d3e31mr33877467ild.3.1675091877700; Mon, 30 Jan 2023 07:17:57 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 146/171] Correct SPL use of STM32MP15X_STM32IMAGE Date: Mon, 30 Jan 2023 08:15:47 -0700 Message-Id: <20230130151612.212732-147-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 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 --- 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 218d9ef282a..c21c5c42fe1 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); }