From patchwork Sun Nov 20 13:30:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706770 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=F8MnJLlX; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFWxY42PYz23mR for ; Mon, 21 Nov 2022 00:45:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CAE0F85357; Sun, 20 Nov 2022 14:35:39 +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="F8MnJLlX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 77A1B85286; Sun, 20 Nov 2022 14:34:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 2074A85284 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qv1-xf2a.google.com with SMTP id c8so6451320qvn.10 for ; Sun, 20 Nov 2022 05:34:23 -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=o+Zah7YAuVGgyuC1NJaywKchE6fnjRVP4xwDzLSjtOE=; b=F8MnJLlX7GiCRvjescZJDAMVjH/7445HDRtj4uh+A/j8OQzXvylmXmYvNMtaMVzTUE hqXvYNlyi+ZWpxAMxar7hR8QY9Khf+ljBmKtENzNxesyJVgo/pTls23j5t1+lEbXrsRY rUCpBJ38V/zTc2miJmRb4IozBadvU6dWeCD+Q= 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=o+Zah7YAuVGgyuC1NJaywKchE6fnjRVP4xwDzLSjtOE=; b=BO166KMaeGoYMEHro+/Y0WBpBdGDUvXLOXthozsDhcldm7KBueZtV/uqlXaAXSdgnp 0C6uTXtSIHHJvz5tPNQoxahXXhHfIiIlEyxv+bRA+2oyNSDMPvQs/kXPF6MYDixfpo3M 1R8+k1sG/pAWDSJpU96tcewKQUxvfNPdQoJNUHJTGLNFaX+Q8NPc9q6kOJBXvTdKP8ei CcnIkBhkXt/I6+fLe4UQK668LkKW7IwXedhiKb+VdRZZ8nD2iUMIKVe7KbEJXZl27HUh hwTWt0b0DLE2xTxd7jb0VMRrhXJYuOwsOxHPmizXA4KpU8Cc/dIWrOuczmP8zD9FcS6i bSmg== X-Gm-Message-State: ANoB5pkSEzYF/fj4HThBMCnXoYTWBYqUtr/bbo3tglEDq/9yFq4V+YxM 0312peGekR77iwHQI058builBIP4fquyDQ== X-Google-Smtp-Source: AA0mqf5+FZJDd+A7PgcREH2oSVuSXK5KTDBrq71D5TWi5ADtGlpav+15zvCr9sOF0Jc6HZ8elbYUkA== X-Received: by 2002:a05:6214:108a:b0:4bc:22ff:39ce with SMTP id o10-20020a056214108a00b004bc22ff39cemr13783730qvr.91.1668951261699; Sun, 20 Nov 2022 05:34:21 -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.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:21 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 037/241] global: Migrate CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to CFG Date: Sun, 20 Nov 2022 08:30:28 -0500 Message-Id: <20221120133352.3055600-38-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 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 | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- doc/README.fsl-dpaa | 4 ++-- drivers/net/fm/eth.c | 2 +- drivers/net/fm/init.c | 2 +- include/fm_eth.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 29b08d56ee52..410ae34e9504 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -189,7 +189,7 @@ #define CFG_SYS_NUM_FMAN 1 #define CFG_SYS_NUM_FM1_DTSEC 4 #define CFG_SYS_NUM_FM1_10GEC 1 -#define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#define CFG_FSL_FM_10GEC_REGULAR_NOTATION #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CFG_SYS_FM1_CLK 0 #define CONFIG_QBMAN_CLK_DIV 1 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 283fdf3b458a..05b83952f231 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1303,7 +1303,7 @@ typedef struct ccsr_gur { #define FSL_CORENET_DEVDISR2_DTSEC1_6 0x04000000 #define FSL_CORENET_DEVDISR2_DTSEC1_9 0x00800000 #define FSL_CORENET_DEVDISR2_DTSEC1_10 0x00400000 -#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION #define FSL_CORENET_DEVDISR2_10GEC1_1 0x80000000 #define FSL_CORENET_DEVDISR2_10GEC1_2 0x40000000 #else diff --git a/doc/README.fsl-dpaa b/doc/README.fsl-dpaa index 3ef5eeb32e11..91c14ad12227 100644 --- a/doc/README.fsl-dpaa +++ b/doc/README.fsl-dpaa @@ -1,10 +1,10 @@ This file documents Freescale DPAA-specific options. FMan (Frame Manager) - - CONFIG_FSL_FM_10GEC_REGULAR_NOTATION + - CFG_FSL_FM_10GEC_REGULAR_NOTATION on SoCs T4240, T2080, LS1043A, etc, the notation between 10GEC and MAC as below: 10GEC1->MAC9, 10GEC2->MAC10, 10GEC3->MAC1, 10GEC4->MAC2 on SoCs T1024, etc, the notation between 10GEC and MAC as below: 10GEC1->MAC1, 10GEC2->MAC2 - so we introduce CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on + so we introduce CFG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on which 10GEC enumeration is consistent with MAC enumeration. diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index c8381cc7133c..c84d1c0a713e 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -738,7 +738,7 @@ static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg) num = fm_eth->num; #ifdef CONFIG_SYS_FMAN_V3 -#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION if (fm_eth->type == FM_ETH_10G_E) { /* 10GEC1/10GEC2 use mEMAC9/mEMAC10 on T2080/T4240. * 10GEC3/10GEC4 use mEMAC1/mEMAC2 on T2080. diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 618c1bccbe3f..23a25056f822 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -261,7 +261,7 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop) } #ifdef CONFIG_SYS_FMAN_V3 -#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION /* * On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same * dual-role MAC, when FM1_10GEC1 is enabled and FM1_DTSEC9 diff --git a/include/fm_eth.h b/include/fm_eth.h index aeb640925ee2..4f130a8d04a5 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -88,7 +88,7 @@ enum fm_eth_type { offsetof(struct ccsr_fman, memac[n-1]),\ } -#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION #define FM_TGEC_INFO_INITIALIZER(idx, n) \ { \ FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR) \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 278fc032799a..14823f42e61e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -37,7 +37,7 @@ CFG_FLASH_VERIFY CFG_FM_PLAT_CLK_DIV CFG_FSL_CPLD CFG_FSL_ESDHC_PIN_MUX -CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +CFG_FSL_FM_10GEC_REGULAR_NOTATION CONFIG_FSL_ISBC_KEY_EXT CONFIG_FSL_PMIC_BITLEN CONFIG_FSL_PMIC_BUS