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 21793C4332F for ; Thu, 22 Dec 2022 00:47:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9834F85242; Thu, 22 Dec 2022 01:47:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671670033; bh=dW87he4pehCfosVIe8O1QVdqR0B+hgSaBSRN8UlAwKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=V77d92LC+NfJ30fVirQQXx80h1xW8zK0lHQsMcbgjUIfCienGl9aiQk08uMnKol3E 7AePgKn+2ZPJGWswAPs1VkVHufcF286U2hQy6Zb9wLx/DeBp4GkGMvydZAsvPXlyRk BoWTZ2/uzlPQq+01h7PLt74THBX6f+kAgaV+rIZPVgGCrh6aq8VPJHww1PQcKjrSl2 Rl1fUFdu+s23ntw+JajOyCHUZfFOtkfp6zC9894O5BF+AIo7BC+n1jpGaVo3fifOsN CsLxZ8LJdSVkOBPjAyCGGieG3A7vET/IS6U9+RnkgoMT9rzaGPUqlcgkONuK6omr5M QBY/CvUnSWPkw== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 3A82085278; Thu, 22 Dec 2022 01:47:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671670023; bh=dW87he4pehCfosVIe8O1QVdqR0B+hgSaBSRN8UlAwKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x24El5JzsANsz45s7HG9T6Wet1Y5+ZoSB+LSq1HcowN+hG9qXXA0OmMp8bkZ15w5A 068pop0LJfDg9XjuqcrM+68m/twcWUrT5m6AES8Y1zGq3Dr807BbtrfcrkCydfZhkW DEoDaowqToWn0QqWUCs99CLKorPMbdyLUZe9RTU7fy6yS1nM7gt2V3uPsSsUOxX8dY MF/F4KEYcxRxK7IE0GsdLB0+dmd3QMepqbJTMopqirxZ6/ukgYf962Apf3nvy4HVYy rlE70Vf3fQJivW1C3OGeqPEwp8Df5Ac7sCmJZ3hPAQ8m4qFOBEaxNsFqXInmGOvccY xD1kr4ZHszrHQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , "NXP i.MX U-Boot Team" , "Ying-Chun Liu (PaulLiu)" , Adam Ford , Andrejs Cainikovs , Fabio Estevam , Manoj Sai , Marcel Ziswiler , Michael Trimarchi , Peng Fan , Ricardo Salveti , Simon Glass , Stefano Babic , Tim Harvey , Ye Li Subject: [PATCH 04/10] arm: dts: imx8m: Require ATF BL31 blob only if not PSCI provider Date: Thu, 22 Dec 2022 01:46:37 +0100 Message-Id: <20221222004643.1013095-4-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221222004643.1013095-1-marex@denx.de> References: <20221222004643.1013095-1-marex@denx.de> 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 In case U-Boot itself if the PSCI provider on i.MX8M, do not require the ATF BL31 blob, as at that point the blob is useless and would interfere with U-Boot operation. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "NXP i.MX U-Boot Team" Cc: "Ying-Chun Liu (PaulLiu)" Cc: Adam Ford Cc: Andrejs Cainikovs Cc: Fabio Estevam Cc: Manoj Sai Cc: Marcel Ziswiler Cc: Michael Trimarchi Cc: Peng Fan Cc: Ricardo Salveti Cc: Simon Glass Cc: Stefano Babic Cc: Tim Harvey Cc: Ye Li --- arch/arm/dts/imx8mm-u-boot.dtsi | 4 ++++ arch/arm/dts/imx8mn-u-boot.dtsi | 4 ++++ arch/arm/dts/imx8mp-u-boot.dtsi | 4 ++++ arch/arm/dts/imx8mq-u-boot.dtsi | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index 60d49bc3d7b..25dc8e12dde 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -99,6 +99,7 @@ }; }; +#ifndef CONFIG_ARMV8_PSCI atf { arch = "arm64"; compression = "none"; @@ -112,6 +113,7 @@ type = "atf-bl31"; }; }; +#endif binman_fip: fip { arch = "arm64"; @@ -140,7 +142,9 @@ description = "NAME"; fdt = "fdt-SEQ"; firmware = "uboot"; +#ifndef CONFIG_ARMV8_PSCI loadables = "atf"; +#endif }; }; }; diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 95f45ad2522..b019b2341d6 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -161,6 +161,7 @@ }; }; +#ifndef CONFIG_ARMV8_PSCI atf { arch = "arm64"; compression = "none"; @@ -174,6 +175,7 @@ type = "atf-bl31"; }; }; +#endif binman_fip: fip { arch = "arm64"; @@ -202,7 +204,9 @@ description = "NAME"; fdt = "fdt-SEQ"; firmware = "uboot"; +#ifndef CONFIG_ARMV8_PSCI loadables = "atf"; +#endif }; }; }; diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index f9883aa1336..9a3de8f6a07 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -120,6 +120,7 @@ }; }; +#ifndef CONFIG_ARMV8_PSCI atf { description = "ARM Trusted Firmware"; type = "firmware"; @@ -133,6 +134,7 @@ type = "atf-bl31"; }; }; +#endif @fdt-SEQ { description = "NAME"; @@ -152,7 +154,9 @@ description = "NAME"; fdt = "fdt-SEQ"; firmware = "uboot"; +#ifndef CONFIG_ARMV8_PSCI loadables = "atf"; +#endif }; }; }; diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi index 8d385e8da4f..2bc9f413da0 100644 --- a/arch/arm/dts/imx8mq-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-u-boot.dtsi @@ -114,6 +114,7 @@ }; }; +#ifndef CONFIG_ARMV8_PSCI atf { arch = "arm64"; compression = "none"; @@ -127,6 +128,7 @@ type = "blob-ext"; }; }; +#endif fdt { compression = "none"; @@ -147,7 +149,9 @@ description = "NAME"; fdt = "fdt"; firmware = "uboot"; +#ifndef CONFIG_ARMV8_PSCI loadables = "atf"; +#endif }; }; }; -- 2.35.1