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 541D8C4332F for ; Sun, 20 Nov 2022 13:48:14 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 05AF785384; Sun, 20 Nov 2022 14:36:11 +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="DeiGhmpZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C3C285330; Sun, 20 Nov 2022 14:35:22 +0100 (CET) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (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 8E260852EB for ; Sun, 20 Nov 2022 14:34:57 +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-qv1-xf34.google.com with SMTP id d13so757507qvj.8 for ; Sun, 20 Nov 2022 05:34:57 -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=dQOjLecCdp9ED6bxvMITAQcNUnHf8Dk+W+PVjTJbTPs=; b=DeiGhmpZuXvr+KpcIOp6G6Esl8UZdSS7NkLM+VHV5CarlAnoqAKiSVls3cx84GgbE8 TujGtk/5VqWGWCl74f4uDwA9keaqFjJo5L4gP073tGWYE2AViq51Lm7HcIw62f1dIiSP /r+PtR2mWbxsMCoohXcR090CkschLD418yVzE= 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=dQOjLecCdp9ED6bxvMITAQcNUnHf8Dk+W+PVjTJbTPs=; b=jXkweZcFhr3aw8GGsXbv3SjHkOSx7vg6bYyFM3Fkn+bSY4TgWGR27yKG28ZrlxZFSv iEwd0xeBgD5FGgdfsB9uWcNPHWIpJqIJvvz5g+o7uqqYJgYb3WUadGhNEijqBH0jixJm Bu7h2Z7LrH2Al4Nfd3dcZH95t/D3ZzLQf4KYTf6oJ3Xd5aHmjJX2dCSIwNbt29jqtpNk 1Wu45I0tQoGAhOaCirvvPkS51mqZyVMJOYuKmFn0aTGP4Lc2h0iF1BqmzrEzmNNk1yKJ 9NzSev0yDepic4CSxIKQCTjfmjH0TTAY8f9luXAvfb2/pMabA/Yj4iXOoiQ6SEOktE77 aJgA== X-Gm-Message-State: ANoB5pkT5j8sJLCTXsXrjUlY9cKJEHQKayyNQFGHDqisM6O8PhSBZxUK Bu7AH4CFvRnaa7d5SvZixxK+l9dfBSHbQw== X-Google-Smtp-Source: AA0mqf5ozwbF3maw1zdm4DUbq+TBqCVpi9Gs/mqtjiybaeQyCOJm5mGDlMK0xvhLbUX1/6doQJAUvg== X-Received: by 2002:a05:6214:46:b0:4c6:3f1f:e851 with SMTP id c6-20020a056214004600b004c63f1fe851mr2356976qvr.29.1668951296214; Sun, 20 Nov 2022 05:34:56 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:55 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 089/241] global: Migrate CONFIG_L2_CACHE to CFG Date: Sun, 20 Nov 2022 08:31:20 -0500 Message-Id: <20221120133352.3055600-90-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-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/powerpc/cpu/mpc85xx/cpu_init.c | 4 ++-- arch/powerpc/cpu/mpc85xx/fdt.c | 4 ++-- arch/x86/cpu/intel_common/car2.S | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/socrates.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index f07e8ab388e8..562d7074ed75 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -515,7 +515,7 @@ int enable_cluster_l2(void) int l2cache_init(void) { __maybe_unused u32 svr = get_svr(); -#ifdef CONFIG_L2_CACHE +#ifdef CFG_L2_CACHE ccsr_l2cache_t *l2cache = (void __iomem *)CFG_SYS_MPC85xx_L2_ADDR; #elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500) struct ccsr_cluster_l2 * l2cache = (void __iomem *)CFG_SYS_FSL_CLUSTER_1_L2; @@ -523,7 +523,7 @@ int l2cache_init(void) puts ("L2: "); -#if defined(CONFIG_L2_CACHE) +#if defined(CFG_L2_CACHE) volatile uint cache_ctl; uint ver; u32 l2siz_field; diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index a7e1df104d73..635eaed12152 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -185,7 +185,7 @@ static inline void ft_fixup_l3cache(void *blob, int off) #define ft_fixup_l3cache(x, y) #endif -#if defined(CONFIG_L2_CACHE) || \ +#if defined(CFG_L2_CACHE) || \ defined(CONFIG_BACKSIDE_L2_CACHE) || \ defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) static inline void ft_fixup_l2cache_compatible(void *blob, int off) @@ -218,7 +218,7 @@ static inline void ft_fixup_l2cache_compatible(void *blob, int off) } #endif -#if defined(CONFIG_L2_CACHE) +#if defined(CFG_L2_CACHE) /* return size in kilobytes */ static inline u32 l2cache_size(void) { diff --git a/arch/x86/cpu/intel_common/car2.S b/arch/x86/cpu/intel_common/car2.S index f8cf78586d02..908f2251b67a 100644 --- a/arch/x86/cpu/intel_common/car2.S +++ b/arch/x86/cpu/intel_common/car2.S @@ -246,7 +246,7 @@ car_cqos: or $(PREFETCH_L1_DISABLE | PREFETCH_L2_DISABLE), %eax wrmsr -#if (CONFIG_DCACHE_RAM_SIZE == CONFIG_L2_CACHE_SIZE) +#if (CONFIG_DCACHE_RAM_SIZE == CFG_L2_CACHE_SIZE) /* * If CAR size is set to full L2 size, mask is calculated as all-zeros. * This is not supported by the CPU/uCode. diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index d2a70aa88f88..5f2fc5516d5e 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -20,7 +20,7 @@ /* * These can be toggled for performance analysis, otherwise use default. */ -#define CONFIG_L2_CACHE /* toggle L2 cache */ +#define CFG_L2_CACHE /* toggle L2 cache */ /* * Only possible on E500 Version 2 or newer cores. diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 67ee74ba6232..794289627fe8 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -99,7 +99,7 @@ /* * These can be toggled for performance analysis, otherwise use default. */ -#define CONFIG_L2_CACHE /* toggle L2 cache */ +#define CFG_L2_CACHE /* toggle L2 cache */ /* DDR Setup */ #define SPD_EEPROM_ADDRESS 0x52 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index de6440a07564..c8ecd2dc0fca 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -112,7 +112,7 @@ /* * These can be toggled for performance analysis, otherwise use default. */ -#define CONFIG_L2_CACHE +#define CFG_L2_CACHE #define CFG_SYS_CCSRBAR 0xffe00000 #define CFG_SYS_CCSRBAR_PHYS_LOW CFG_SYS_CCSRBAR diff --git a/include/configs/socrates.h b/include/configs/socrates.h index fb2b76eb829a..9eee8de41644 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -40,7 +40,7 @@ /* * These can be toggled for performance analysis, otherwise use default. */ -#define CONFIG_L2_CACHE /* toggle L2 cache */ +#define CFG_L2_CACHE /* toggle L2 cache */ #define CFG_SYS_INIT_DBCR DBCR_IDM /* Enable Debug Exceptions */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ca45b1eeb514..07fd8dbeab11 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -97,7 +97,7 @@ CFG_KSNET_SERDES_LANES_PER_SGMII CFG_KSNET_SERDES_SGMII2_BASE CFG_KSNET_SERDES_SGMII_BASE CFG_L1_INIT_RAM -CONFIG_L2_CACHE +CFG_L2_CACHE CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LOWPOWER_ADDR CONFIG_LOWPOWER_FLAG -- 2.25.1