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 09D60C4332F for ; Tue, 13 Dec 2022 04:46:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B94385451; Tue, 13 Dec 2022 05:46:19 +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=1670906779; bh=7CwfANPeKds5Bmre2wS/Ijn8FVK7basUc9hTpgx8ask=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=Z4gKkQdi7bkiP5W0w5/RwgBefpcYLf7jV2cYqwSQsm2NZqI8TCpiPnSrhUn830rJN MkWZiGf8bnBsNBvh7rj+gcGVaMhXCkSf6koQuy717AWQNEVkm5vDIRMIRyb2CMLFCS /QimWY9fczqQYhiMgg8Rj252dn26FL2q3jNfatcB2EsVKqCFPVCdUQNouWy6ZSec8P cKucIOyGNf5CZ3ibVJ6UAAisoO+P1WxO0kGjKlOzL6mh42zt6cHcoa4FMKl8tiibQy 2KmedyYmEzqylASQG8t6pAS11lgDE/wUiEIoHg45M9hlaSdGlvW9SVW7txG4RF83Pr 55hvFVXVaKhcA== 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 BA9D884D94; Tue, 13 Dec 2022 05:46:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1670906777; bh=7CwfANPeKds5Bmre2wS/Ijn8FVK7basUc9hTpgx8ask=; h=From:To:Cc:Subject:Date:From; b=bWP7SIeM14WYtnb/ANtGTalFhVou+MvVGivtpcvCU+TTYn0q6Zafj93KTrRcnzFZt gQQAyKOMIIjG7E5SryZD4ZLKzP/JPH4j6V/IAr3h7kzfALbzYhVzULtSXAQpylyqyj Y+BCw7vNdKaXKJux2iYZdhiRfwPpnEJ4pfxoj+T+XhyLNUN+txS1xvihRmSxEVEX2v MTAmulbrqIqQnLXrZLBBCuEg7WaOOLbXsgdh4nyfStOkE+ta5PgxWmCAfK9d6sMxoN 1xf8XG4y/pXiijIpDXX2Vqqi/qMS3LOXQCK2H3IXXB45fVIV7yNOx2UjPJTkIO356b cJrBgNi8UmTFQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , "NXP i.MX U-Boot Team" , Fabio Estevam , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Peng Fan , Stefano Babic Subject: [PATCH 1/2] ARM: imx: bootaux: Fix macro misuse Date: Tue, 13 Dec 2022 05:46:06 +0100 Message-Id: <20221213044607.268450-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 There are no CONFIG_{TOOLS_,SPL_,TPL_,}IMX8M macros, nor is there one for ARM64. Use plain IS_ENABLED(CONFIG_IMX8M) and IS_ENABLED(CONFIG_ARM64) to avoid expanding the {TOOLS_,SPL_,TPL_,} part. Fixes: 56c2dbdabab5 ("imx: bootaux: cleanup code") Signed-off-by: Marek Vasut --- Cc: "NXP i.MX U-Boot Team" Cc: Fabio Estevam Cc: Marek BehĂșn Cc: Peng Fan Cc: Stefano Babic --- arch/arm/mach-imx/imx_bootaux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 8115bf40f1a..433c1f80cee 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -15,7 +15,7 @@ #include /* Just to avoid build error */ -#if CONFIG_IS_ENABLED(IMX8M) +#if IS_ENABLED(CONFIG_IMX8M) #define SRC_M4C_NON_SCLR_RST_MASK BIT(0) #define SRC_M4_ENABLE_MASK BIT(0) #define SRC_M4_REG_OFFSET 0 @@ -106,7 +106,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) if (!pc) return CMD_RET_FAILURE; - if (!CONFIG_IS_ENABLED(ARM64)) + if (!IS_ENABLED(CONFIG_ARM64)) stack = 0x0; } else { /* @@ -128,7 +128,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) flush_dcache_all(); /* Enable M4 */ - if (CONFIG_IS_ENABLED(IMX8M)) { + if (IS_ENABLED(CONFIG_IMX8M)) { arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0, 0, 0, 0, 0, NULL); } else { clrsetbits_le32(SRC_BASE_ADDR + SRC_M4_REG_OFFSET, @@ -143,7 +143,7 @@ int arch_auxiliary_core_check_up(u32 core_id) struct arm_smccc_res res; unsigned int val; - if (CONFIG_IS_ENABLED(IMX8M)) { + if (IS_ENABLED(CONFIG_IMX8M)) { arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0, 0, 0, 0, 0, &res); return res.a0; } -- 2.35.1