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 F2B06C636CD for ; Sun, 5 Feb 2023 23:03:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9808085CF0; Sun, 5 Feb 2023 23:56:12 +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="ZkjdrmV5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7F1A385B08; Sun, 5 Feb 2023 23:54:07 +0100 (CET) Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 225A685ABE for ; Sun, 5 Feb 2023 23:42:56 +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-xd2a.google.com with SMTP id z21so3912469iol.0 for ; Sun, 05 Feb 2023 14:42:56 -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=0y9nBtLwgLwxY/Ae0mWE7IMDyGkymeXr/7J/UV542qM=; b=ZkjdrmV5gOhvRQsweleF1F6Nnr5m/6q+eLTb/+nS0CIhaz6YVeZrDmgTH8Mnp5TAjQ 7DrRXneNz2kY05GKOgHIpVZP1ERmFyQUd1oPLOzmtcTDFlCJ7btwALDN+ZM7BAHujjUm 6yjA0+tn/qxpFg+eHWpMzmt6r626SS/QbnAgM= 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=0y9nBtLwgLwxY/Ae0mWE7IMDyGkymeXr/7J/UV542qM=; b=wqra5VH/cr24Ic1bdlmWwUNPiTWbsnUBhjcHiD2S35J4PRS+XyFfHk/L7b2mXJS7bx yyp9zt56WVnlBKiLXth/COtS6jV3afWrmYjb85fZpGhsjSctY9tedr4SD7dd/9Zviroy jkbcHiKyV0KJwbwzVW6DUzGEUWxRO5rHRg9OS34grn2cy5ncL/g4hAJlfZU5n+ha81C/ YG8lizj6D6okUs3EP9gU6md643WT+AwfJNanFxcqBmeqGqispSDOkoJkeAziwD1nC7s6 74rOqmSmTC3oxPfOpvIRivgbW5c/lskPq+1BcKcuGq/FrgzSaUZ91ty9x+6h5t4fyz0A LcMQ== X-Gm-Message-State: AO0yUKWsSb3iqVDO9avvatE08X9T+14n0eJRuCx3FqqBdT1cPJPXiEFb nK9I/+PvoZp8E08eEUcWm09k4nTAqYgrJ/c1 X-Google-Smtp-Source: AK7set/hNTUgifZ77wp+iPHWBqn/LbQHO4YPQfXi310qZP8YlPxBN1rcUZi6pk9fuwqFYox3/xl/Rg== X-Received: by 2002:a5e:a918:0:b0:715:ba8c:3b11 with SMTP id c24-20020a5ea918000000b00715ba8c3b11mr11934290iod.14.1675636975367; Sun, 05 Feb 2023 14:42:55 -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.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:54 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 100/169] Correct SPL uses of IMX8M Date: Sun, 5 Feb 2023 15:40:09 -0700 Message-Id: <20230205224118.233425-101-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 3 usages of this option to the non-SPL form, since there is no SPL_IMX8M defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-imx/imx_bootaux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 1a3e538c4fa..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 @@ -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.39.1.519.gcb327c4b5f-goog