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 87199C4332F for ; Sun, 20 Nov 2022 13:42:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C94528531E; Sun, 20 Nov 2022 14:35:16 +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="Oum4LPa8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C40A85294; Sun, 20 Nov 2022 14:34:32 +0100 (CET) Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) (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 C26558528E for ; Sun, 20 Nov 2022 14:34:27 +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-xf2d.google.com with SMTP id s18so4872764qvo.9 for ; Sun, 20 Nov 2022 05:34:27 -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=i4ctJm5ERmFlupSY6LJf6dxxAq3nBdHP8LhIXzTJiqk=; b=Oum4LPa8ZXryQQ5LYIipGEtsw6Nid06tIO6piwZW3OhTzZ4+8/RuQVvqWeF+UOEig8 lhLveAUHWnVoXBcx+fERUU4q5wmak91iryBEuMCQkdUqSliZ5YZiCotL/mYUcaYjTHP3 2FAB8rbxvh7AywYc3aRiynmIDmzmlc4UpaV4A= 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=i4ctJm5ERmFlupSY6LJf6dxxAq3nBdHP8LhIXzTJiqk=; b=qH/cOOe481zQJHBbGYjbhcX7Qo3OO7QahOAugCajU9Lw/ssPTeR6BvDAPuS71Yyarw zH14HibeAVGgTuOO87L8PyEB2mY20d03ota6DrjFnGMYDE8IFTsObNmwSjHeG7RacPCJ V0jBQz9fFbdDQXa6GpoSfgjyFOrztrwP9Y+s4C6zJJ9huqB0iK6RPvkKFPhJ1wVpZmSJ /PIBCyvIDGV9vR4qT1IGpNQpe6SmYFH2zjJXkzDG6FO2hMn+AOAf4mmh84vcoLBdnUEC YwhZZf5ciQeLBDjGlaAX30ZSxVMl8fzkRndwIbdz3e2pj2XFNAHX6tcbfUp2Tiwf95WI Oo2g== X-Gm-Message-State: ANoB5pmqVMqELLhk+bq8ke7oZ2D68BEr+7H1zIhtHt8l24KF90FAGvmN zMycG+KQNNCagrh+pYJgaIlQFC72nUrJTg== X-Google-Smtp-Source: AA0mqf6as/YvMbXdr3eKt1iZGlxwA+5Cx6NDgWdlDPmDhLS9HkOQMbWgx9d3+A3CzRmTLqK9IyoOXw== X-Received: by 2002:a05:6214:458c:b0:4c6:aa7b:56d9 with SMTP id op12-20020a056214458c00b004c6aa7b56d9mr1490781qvb.44.1668951266448; Sun, 20 Nov 2022 05:34:26 -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.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:25 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 044/241] global: Migrate CONFIG_FSL_SDHC_V2_3 to CFG Date: Sun, 20 Nov 2022 08:30:35 -0500 Message-Id: <20221120133352.3055600-45-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/include/asm/config_mpc85xx.h | 8 ++++---- include/fsl_esdhc.h | 2 +- include/fsl_esdhc_imx.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 410ae34e9504..d6b2b9b469a3 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -23,7 +23,7 @@ #define CFG_SYS_FSL_SRIO_MSG_UNIT_NUM 2 #elif defined(CONFIG_ARCH_P1010) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 4 @@ -107,12 +107,12 @@ #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 #elif defined(CONFIG_ARCH_BSC9131) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3 #elif defined(CONFIG_ARCH_BSC9132) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3 @@ -220,7 +220,7 @@ #elif defined(CONFIG_ARCH_C29X) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2_1 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CFG_SYS_FSL_SEC_IDX_OFFSET 0x20000 diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 7ab1460abc6e..b2c238461a1b 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -140,7 +140,7 @@ #define WML 0x2e044 #define WML_WRITE 0x00010000 -#ifdef CONFIG_FSL_SDHC_V2_3 +#ifdef CFG_FSL_SDHC_V2_3 #define WML_RD_WML_MAX 0x80 #define WML_WR_WML_MAX 0x80 #define WML_RD_WML_MAX_VAL 0x0 diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index b8efd2a1664c..dc789c0ba653 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -143,7 +143,7 @@ #define WML 0x2e044 #define WML_WRITE 0x00010000 -#ifdef CONFIG_FSL_SDHC_V2_3 +#ifdef CFG_FSL_SDHC_V2_3 #define WML_RD_WML_MAX 0x80 #define WML_WR_WML_MAX 0x80 #define WML_RD_WML_MAX_VAL 0x0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8ba453991703..1093721dca5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -44,7 +44,7 @@ CFG_FSL_PMIC_BUS CFG_FSL_PMIC_CLK CFG_FSL_PMIC_CS CFG_FSL_PMIC_MODE -CONFIG_FSL_SDHC_V2_3 +CFG_FSL_SDHC_V2_3 CONFIG_FSL_SERDES1 CONFIG_FSL_SERDES2 CONFIG_GATEWAYIP -- 2.25.1