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 02A2DC4332F for ; Sun, 20 Nov 2022 14:37:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB21B85357; Sun, 20 Nov 2022 15:37:17 +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="jYSxu7nQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 225068548C; Sun, 20 Nov 2022 15:12:09 +0100 (CET) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 21D4785371 for ; Sun, 20 Nov 2022 15:09:45 +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-x829.google.com with SMTP id fz10so5939874qtb.3 for ; Sun, 20 Nov 2022 06:09:45 -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=DeLOoGaBYKN+KYhThhzsijdIUbPUoKtTjZmnVEQMWFw=; b=jYSxu7nQ2MmSebGQvJ7C+Hy18tSF2qqwbWFUDpqoeNNax3oOyfR2HCPyJ0qy5pQBt4 k5iNJKJUvFYFOFS9vxCnK+3wXSI/zEQBEwNKZa7yqohV386YN1MqgOaya+UkZQYEB38E R3ZaIpvBfENkAYkzIJrKUQxG0KR/9O8U9Wsec= 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=DeLOoGaBYKN+KYhThhzsijdIUbPUoKtTjZmnVEQMWFw=; b=AOVHBtvsfkKLJKrFMiZh6HzUzUKGc6hpjo6aYc/PrAsAo0Upez8g7YnmrpaYPUpD+z uEmw2d18oQh9lU5ZDUtc5G3g6SoQR+Q7tHNh+CBIUhtE48Ql10U5yZYciCkdosNm1VBZ a9Vsg5ADirZ0eg6j5dDvjD4ERc7a8tTK+RNRxM4wLh767xHIbpRfcPTkjBfkX/1cNc3U WWUigIUsbfjevKBimvz5lgmlrPEEG3yvVR2NiLcLTPTFg93YnWqn8t4Mt1NOpSFUB0o4 wum4iWI1a+dP4Z8/apO1C1JufmoNrxUth7G3JqqQOTPNGZqlNxWjoU5nkps9ZhUuC3X6 R9XQ== X-Gm-Message-State: ANoB5pmDHn00+ahOfI8EAbNOWl5ocCcb99pFnk98lZPxa7U3wqjHuaVy /fzu1/FOvy2PE8YBUVdfG6UAEjkcOWh5xg== X-Google-Smtp-Source: AA0mqf5pB9+Fi5+AwOXjAZZQtcyhUXgpzUcLgghCF0uQROTISRQUZX4IrYQ88l4tWiuGVIPWD4dSDw== X-Received: by 2002:ac8:1246:0:b0:3a5:fbf9:1f7b with SMTP id g6-20020ac81246000000b003a5fbf91f7bmr13881674qtj.353.1668953339228; Sun, 20 Nov 2022 06:08:59 -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.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:58 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 156/241] global: Migrate CONFIG_PPC_SPINTABLE_COMPATIBLE to CFG Date: Sun, 20 Nov 2022 09:07:46 -0500 Message-Id: <20221120140829.3057894-47-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/powerpc/cpu/mpc85xx/cpu_init.c | 4 ++-- arch/powerpc/cpu/mpc85xx/release.S | 6 +++--- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 562d7074ed75..e5e00c5eade9 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -659,7 +659,7 @@ int cpu_init_r(void) #ifdef CFG_SYS_LBC_LCRR fsl_lbc_t *lbc = (void __iomem *)LBC_BASE_ADDR; #endif -#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) +#if defined(CFG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) extern int spin_table_compat; const char *spin; #endif @@ -725,7 +725,7 @@ int cpu_init_r(void) mtspr(SPRN_HDBCR0, (mfspr(SPRN_HDBCR0) | 0x80000000)); #endif -#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) +#if defined(CFG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) spin = env_get("spin_table_compat"); if (spin && (*spin == 'n')) spin_table_compat = 0; diff --git a/arch/powerpc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S index 391751ce1e71..57cc4fda816c 100644 --- a/arch/powerpc/cpu/mpc85xx/release.S +++ b/arch/powerpc/cpu/mpc85xx/release.S @@ -356,7 +356,7 @@ __secondary_reset_vector: .align L1_CACHE_SHIFT .global __second_half_boot_page __second_half_boot_page: -#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE +#ifdef CFG_PPC_SPINTABLE_COMPATIBLE lis r3,(spin_table_compat - __second_half_boot_page)@h ori r3,r3,(spin_table_compat - __second_half_boot_page)@l add r3,r3,r11 /* r11 has the address of __second_half_boot_page */ @@ -404,7 +404,7 @@ __second_half_boot_page: * "spin_table_compat=no". After Linux is fixed, we can remove this macro * and related code. For now, it is enabled by default. */ -#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE +#ifdef CFG_PPC_SPINTABLE_COMPATIBLE cmpwi r14,0 beq 4f dcbf 0, r10 @@ -486,7 +486,7 @@ __second_half_boot_page: __spin_table: .space CONFIG_MAX_CPUS*ENTRY_SIZE -#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE +#ifdef CFG_PPC_SPINTABLE_COMPATIBLE .align L1_CACHE_SHIFT .global spin_table_compat spin_table_compat: diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 4c19c50bda04..5491a1af2813 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -12,7 +12,7 @@ * This macro should be removed when we no longer care about backwards * compatibility with older operating systems. */ -#define CONFIG_PPC_SPINTABLE_COMPATIBLE +#define CFG_PPC_SPINTABLE_COMPATIBLE #include diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6b824bb14f39..0e792dfbec9c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -165,7 +165,7 @@ CFG_POSTBOOTMENU CFG_POWER_LTC3676_I2C_ADDR CFG_POWER_PFUZE100_I2C_ADDR CFG_POWER_PFUZE3000_I2C_ADDR -CONFIG_PPC_SPINTABLE_COMPATIBLE +CFG_PPC_SPINTABLE_COMPATIBLE CONFIG_PRAM CONFIG_PSRAM_SCFG CONFIG_QBMAN_CLK_DIV -- 2.25.1