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 9C97AC433FE for ; Sun, 20 Nov 2022 14:11:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 930A185306; Sun, 20 Nov 2022 15:09:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="ANZHunQY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D1772852D2; Sun, 20 Nov 2022 15:08:44 +0100 (CET) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 0A613852BE for ; Sun, 20 Nov 2022 15:08:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82d.google.com with SMTP id jr19so5928911qtb.7 for ; Sun, 20 Nov 2022 06:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EX31xQcmGaALlsOzOTi11C+Dy2d1dlIGS50IGr8TeiI=; b=ANZHunQYa7XmzTGTK60oZc630RaIJkEIOMOIfmVRi0cSsq3rEVVTYUiaJHdWZJZCWI zXV7Kc0ukNXEw3NJz9yDi4eYZKWZAL7FOkdh0VSQTOdPPiNunjudotwPP3jUQzUyclzH n0zDo8olhe8+z8mEIAc2f3tXMEmjp1bAqr6T8= 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EX31xQcmGaALlsOzOTi11C+Dy2d1dlIGS50IGr8TeiI=; b=yQtdnkjjuKwjAWB9Ul0pqgo6oRrRjDC0vVbSVTEbrCDBiWXtNp89FNJedDdlPutp7E Vupb2tIZVElXDnlqNMegZDC7nEQWTrjfJns80GIsqEhhZcMnJxc4CpsxdFddM6VS/ogy 6RizAJoWL5aORJTHo3qBAUMP7zcv5y9d7l5a6KtiB5YRS2uNdAboZf2T2+ubm7yFDZXL FrxofeFLJD2FCsibSDTG6hmalKeY92lypO9hgFKQ+Mv7E1rUc4JAYjluriXhAHSRBUui BKYXeC+lH/mY+wCqNZ4gB+bof8zHWY+6BTyL71JCW7QYna3noga7Yfv1kJjL/wPFVGVk j9Og== X-Gm-Message-State: ANoB5plG5UO8sHN+suXOVyQLC+G8A71ruFGRHIZDin9Vl7ix/HMAGXoS ThTdkPoKsKNjZ9hWLSw6urXxr6dkx8epuA== X-Google-Smtp-Source: AA0mqf5Dj6DajSj3u8ZCltBsc9CaLIWPXoNhc2AeDavctutUt3iwzSxkZYRZ0fEzIbrwFiOmhRmNxA== X-Received: by 2002:ac8:13c1:0:b0:3a5:3ae2:ff14 with SMTP id i1-20020ac813c1000000b003a53ae2ff14mr14040518qtj.594.1668953319513; Sun, 20 Nov 2022 06:08:39 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.08.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:39 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 125/241] global: Migrate CONFIG_MXC_GPT_HCLK to CFG Date: Sun, 20 Nov 2022 09:07:15 -0500 Message-Id: <20221120140829.3057894-16-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-1-trini@konsulko.com> 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 Signed-off-by: Tom Rini --- arch/arm/mach-imx/timer.c | 4 ++-- include/configs/brppt2.h | 2 +- include/configs/mx6_common.h | 2 +- include/configs/mx7_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index fcd45f09f181..792772b06473 100644 --- a/arch/arm/mach-imx/timer.c +++ b/arch/arm/mach-imx/timer.c @@ -54,7 +54,7 @@ static inline int gpt_has_clk_source_osc(void) static inline ulong gpt_get_clk(void) { -#ifdef CONFIG_MXC_GPT_HCLK +#ifdef CFG_MXC_GPT_HCLK if (gpt_has_clk_source_osc()) return MXC_HCLK >> 3; else @@ -78,7 +78,7 @@ int timer_init(void) i = __raw_readl(&cur_gpt->control); i &= ~GPTCR_CLKSOURCE_MASK; -#ifdef CONFIG_MXC_GPT_HCLK +#ifdef CFG_MXC_GPT_HCLK if (gpt_has_clk_source_osc()) { i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN; diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 92f34407b401..47a95c0b920a 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -16,7 +16,7 @@ #define CFG_SYS_PL310_BASE L2_PL310_BASE #endif /* !CONFIG_SYS_L2CACHE_OFF */ -#define CONFIG_MXC_GPT_HCLK +#define CFG_MXC_GPT_HCLK /* MMC */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 245530aa640b..1e99cdc7df4d 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -16,7 +16,7 @@ #endif #endif -#define CONFIG_MXC_GPT_HCLK +#define CFG_MXC_GPT_HCLK #include #include diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index d5af6990107d..3a5917fed4b8 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -14,7 +14,7 @@ #include /* Timer settings */ -#define CONFIG_MXC_GPT_HCLK +#define CFG_MXC_GPT_HCLK #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ /* Miscellaneous configurable options */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 92dec899cad7..8aa247c62448 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -133,7 +133,7 @@ CFG_MMC_SUNXI_SLOT CFG_MONITOR_IS_IN_RAM CFG_MTD_NAND_VERIFY_WRITE CFG_MVGBE_PORTS -CONFIG_MXC_GPT_HCLK +CFG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC CONFIG_MXC_NAND_IP_REGS_BASE CONFIG_MXC_NAND_REGS_BASE -- 2.25.1