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 E5684C433FE for ; Sun, 20 Nov 2022 14:25:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52B27854DE; Sun, 20 Nov 2022 15:18:18 +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="qKhFXOW6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DAF06854A4; Sun, 20 Nov 2022 15:18:00 +0100 (CET) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 753E8854A8 for ; Sun, 20 Nov 2022 15:17:54 +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-qk1-x72a.google.com with SMTP id k2so6526201qkk.7 for ; Sun, 20 Nov 2022 06:17:54 -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=2OaCQPt07gLt0POp7wJ2NgW4Qz7oedArxaWkM+FNV1I=; b=qKhFXOW60ymr8PKc1hE4iy4GIn9GGPqaHY6vBE6dnoRAl3slLbYdpZrbjaEBwT4EHT 4/Z2+tbpEvHSLmuwuGC6hT8PjVC/wg++aRYaMkBwU1siemsiYD90s4Sd0jb+XlBJJa97 Co+9PA9HYxnUxJhziOUUwbMRX8IW1kqaVirTw= 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=2OaCQPt07gLt0POp7wJ2NgW4Qz7oedArxaWkM+FNV1I=; b=ZLMLgkh5rDppmpXbtVeXF4t66R9ec0aO64S1yX3olLUdiOTyJ2q4AmfbRdyfmtxTBf OcX48aZvlnkHgPctFOC/b8VLwt1mRU65i5rMHM4Nj8+HIvhSbIX50AWn5cN1KN+lvrGE wGUpG6Q1hl+2zA5VXHu354THeQJd3Q88TVN8TGN6NnG4ssJOW6FGmEX2b/Cemsspg7UY tyPOVniG3ThVeeQ4NJtH0SbSTKYZ2vUmFKgA/9gEG87fIjkQ5gAflG20MHewXy/haAWg P+JnuvI88V9+7qEnwFv9LQoSqNzWZ7UESRdEfirs+F7AJQ++NXFr3g/WCgYzpj74Ycnp 6w4Q== X-Gm-Message-State: ANoB5pnM9B5SaQjgvR0Fp/qqqeLOf/HFrYr20Zy0gX5oSfZSMBp7gv6l YnBjv7TS6C90V/zuwMuKCapo+W0qUTCIig== X-Google-Smtp-Source: AA0mqf6Rygx7GoBl1/P6IYUcDlY1sT96eEYFt0pnp76iwm4gxp7/n/kFBmY8K/8dfT8kdE2GquXfbw== X-Received: by 2002:a05:620a:13d7:b0:6fb:57cb:47ce with SMTP id g23-20020a05620a13d700b006fb57cb47cemr13088537qkl.452.1668953873891; Sun, 20 Nov 2022 06:17:53 -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-20020a05620a1a1700b006ce580c2663sm6400114qkb.35.2022.11.20.06.17.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:53 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 214/241] global: Migrate CONFIG_TSEC3 to CFG Date: Sun, 20 Nov 2022 09:17:16 -0500 Message-Id: <20221120141743.3059310-15-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120141743.3059310-1-trini@konsulko.com> References: <20221120140829.3057894-90-trini@konsulko.com> <20221120141743.3059310-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 --- board/freescale/common/pixis.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- drivers/net/tsec.c | 2 +- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/ls1021aqds.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 4 ++-- include/configs/socrates.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index 87deb4538a22..ce60ec2c10f6 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -308,7 +308,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, switch_mask = PIXIS_VCFGEN1_TSEC2SER; break; #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 case 3: mask = PIXIS_VSPEED2_TSEC3SER; switch_mask = PIXIS_VCFGEN1_TSEC3SER; diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 7ef204763eaa..cbe8e0ddca99 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -216,7 +216,7 @@ int board_eth_init(struct bd_info *bis) SET_STD_TSEC_INFO(tsec_info[num], 2); num++; #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 /* initialize TSEC3 only if Carrier is 1.3 or above on CDS */ if (get_board_version() >= 0x13) { SET_STD_TSEC_INFO(tsec_info[num], 3); diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index e7ba90a8d1a3..4f98d7a5e2c6 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -497,7 +497,7 @@ int board_eth_init(struct bd_info *bis) SET_STD_TSEC_INFO(tsec_info[num], 2); num++; #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 /* P1014 and it's derivatives do not support eTSEC3 */ if (cpu->soc_ver != SVR_P1014) { SET_STD_TSEC_INFO(tsec_info[num], 3); diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 5dac8fcce2cb..b9f519aba6e9 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -385,7 +385,7 @@ int board_eth_init(struct bd_info *bis) } num++; #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 SET_STD_TSEC_INFO(tsec_info[num], 3); num++; #endif diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 7287c6ad4cbb..985cde092bca 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -41,7 +41,7 @@ static struct tsec_info_struct tsec_info[] = { .mii_devname = DEFAULT_MII_NAME }, /* FEC */ #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 STD_TSEC_INFO(3), /* TSEC3 */ #endif #ifdef CONFIG_TSEC4 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 35154630add0..7bc8f238e05b 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -289,8 +289,8 @@ #define CFG_TSEC1_NAME "eTSEC0" #define CFG_TSEC2 1 #define CFG_TSEC2_NAME "eTSEC1" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC2" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC2" #define CONFIG_TSEC4 #define CONFIG_TSEC4_NAME "eTSEC3" #undef CONFIG_MPC85XX_FEC diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index b01b3b019662..dd8dd42b54d5 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -355,8 +355,8 @@ extern unsigned long get_sdram_size(void); #define CFG_TSEC1_NAME "eTSEC1" #define CFG_TSEC2 1 #define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC3" #define TSEC1_PHY_ADDR 1 #define TSEC2_PHY_ADDR 0 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 8747ef260b89..c3c526d8558e 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -257,8 +257,8 @@ #define CFG_TSEC1_NAME "eTSEC1" #define CFG_TSEC2 1 #define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC3" #define TSEC1_PHY_ADDR 1 #define TSEC2_PHY_ADDR 2 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index dfb2679883a9..4560a432bed6 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -371,8 +371,8 @@ #define CFG_TSEC1_NAME "eTSEC1" #define CFG_TSEC2 #define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 +#define CFG_TSEC3_NAME "eTSEC3" #define TSEC1_PHY_ADDR 2 #define TSEC2_PHY_ADDR 0 diff --git a/include/configs/socrates.h b/include/configs/socrates.h index bfba9782405f..3796d3464def 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -113,8 +113,8 @@ #define CFG_TSEC1 1 #define CFG_TSEC1_NAME "TSEC0" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "TSEC1" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "TSEC1" #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c4e7fdfa27fe..a44112ccd25e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -225,8 +225,8 @@ CFG_TSEC1 CFG_TSEC1_NAME CFG_TSEC2 CFG_TSEC2_NAME -CONFIG_TSEC3 -CONFIG_TSEC3_NAME +CFG_TSEC3 +CFG_TSEC3_NAME CONFIG_TSEC4 CONFIG_TSEC4_NAME CONFIG_TSECV2 -- 2.25.1