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 2AE78C4332F for ; Sun, 20 Nov 2022 14:25:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7AB6C854DA; Sun, 20 Nov 2022 15:18: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="t0prrhRK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 139D0854BF; 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 B1637854A4 for ; Sun, 20 Nov 2022 15:17:53 +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 k2so6526195qkk.7 for ; Sun, 20 Nov 2022 06:17:53 -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=XAOYFp6pqj7mxu0RqpRiMTsIDvMF0q+nBEc8rABzG2M=; b=t0prrhRKyRWsGRJIJ+L0KrWTknnkedL2nr1NjOkCk0AzUlQEdtVXkbSCRUH2A3+XzS h8UTuBkWrNHrhb6UdtFIuXp+/C2ZiQJrNqknlStvdY1rtH6Dzznkr63/F5SCw5TVafNk YDxMkLbOOw6gacMe6BvlOyFnGf/FHOvnEy3Oc= 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=XAOYFp6pqj7mxu0RqpRiMTsIDvMF0q+nBEc8rABzG2M=; b=ayWIXP4fR5AS2Si/McqqNkx9dSlbHPaZXVN7yJarp6VkhQsgSv6Vn6fzVu/7C4sOf9 8z3/sQkP3NJr7EBkWvfMKmSo9MnGtwljdRS2ipoqLOFqGQ9Dq0pmiMQtnA5gIaWlBJR+ mvvrImuV1bah2joB5dA0p2S0NeULIP4DoGl4TzVWUM7IWjl/69a0PoyRUrsPnKluwqCM 8EXP3zyoels+Eom3cFulKtKohD3+/8lRrnXVEFVMgjHJ7T5METDGCkVPfm4WExPIBiJc XYT09r9JuBEoE2eIdG/MVIhQPh1H7h6ah3vpk1P3Rk76Pc+vQSkSFKTXkc624DWj7lRb +3QA== X-Gm-Message-State: ANoB5pm3RtueakwSBsns/7qh1cR+exbXjDoyMhh2wM6bCtOfuM/4tu/Z uw7bK66QKLwcCnnv0VPGBYY+k0F1w87zug== X-Google-Smtp-Source: AA0mqf5yMDIcfFbG8fZs78Db6MXqp+res1EZRvy7ax/4bVHcEDdDws0CP/1PcEBRzGL5p/JSicd0aQ== X-Received: by 2002:a05:620a:100f:b0:6fa:26ad:eb68 with SMTP id z15-20020a05620a100f00b006fa26adeb68mr13387061qkj.776.1668953873103; 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.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:52 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 213/241] global: Migrate CONFIG_TSEC2 to CFG Date: Sun, 20 Nov 2022 09:17:15 -0500 Message-Id: <20221120141743.3059310-14-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/MPC837XERDB.h | 6 +++--- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/ls1021aiot.h | 4 ++-- include/configs/ls1021aqds.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index 37d502f7ff4b..87deb4538a22 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -302,7 +302,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, switch_mask = PIXIS_VCFGEN1_TSEC1SER; break; #endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 case 2: mask = PIXIS_VSPEED2_TSEC2SER; switch_mask = PIXIS_VCFGEN1_TSEC2SER; diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 4c10b1075e53..7ef204763eaa 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -212,7 +212,7 @@ int board_eth_init(struct bd_info *bis) SET_STD_TSEC_INFO(tsec_info[num], 1); num++; #endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 SET_STD_TSEC_INFO(tsec_info[num], 2); num++; #endif diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index a527d44d6865..e7ba90a8d1a3 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -493,7 +493,7 @@ int board_eth_init(struct bd_info *bis) SET_STD_TSEC_INFO(tsec_info[num], 1); num++; #endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 SET_STD_TSEC_INFO(tsec_info[num], 2); num++; #endif 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 7d2b8ec12d9f..5dac8fcce2cb 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 @@ -377,7 +377,7 @@ int board_eth_init(struct bd_info *bis) SET_STD_TSEC_INFO(tsec_info[num], 1); num++; #endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 SET_STD_TSEC_INFO(tsec_info[num], 2); if (is_serdes_configured(SGMII_TSEC2)) { printf("eTSEC2 is in sgmii mode.\n"); diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index ad2c68e2a73d..7287c6ad4cbb 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -29,7 +29,7 @@ static struct tsec_info_struct tsec_info[] = { #ifdef CFG_TSEC1 STD_TSEC_INFO(1), /* TSEC1 */ #endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 STD_TSEC_INFO(2), /* TSEC2 */ #endif #ifdef CONFIG_MPC85XX_FEC diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 82101ced5323..b9ac67fae0be 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -41,7 +41,7 @@ #ifdef CONFIG_VSC7385_ENET -#define CONFIG_TSEC2 +#define CFG_TSEC2 /* The flash address and size of the VSC7385 firmware image */ #define CONFIG_VSC7385_IMAGE 0xFE7FE000 @@ -195,8 +195,8 @@ #define TSEC1_PHYIDX 0 #endif -#ifdef CONFIG_TSEC2 -#define CONFIG_TSEC2_NAME "TSEC1" +#ifdef CFG_TSEC2 +#define CFG_TSEC2_NAME "TSEC1" #define TSEC2_PHY_ADDR 0x1c #define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) #define TSEC2_PHYIDX 0 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 53639db0b9dd..35154630add0 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -287,8 +287,8 @@ #define CFG_TSEC1 1 #define CFG_TSEC1_NAME "eTSEC0" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC1" +#define CFG_TSEC2 1 +#define CFG_TSEC2_NAME "eTSEC1" #define CONFIG_TSEC3 1 #define CONFIG_TSEC3_NAME "eTSEC2" #define CONFIG_TSEC4 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 88865aac01eb..b01b3b019662 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -353,8 +353,8 @@ extern unsigned long get_sdram_size(void); #define CFG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ #define CFG_TSEC1 1 #define CFG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" +#define CFG_TSEC2 1 +#define CFG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 1 #define CONFIG_TSEC3_NAME "eTSEC3" diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index fff4e816ecc1..f7063ca2a1a8 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -74,8 +74,8 @@ #define CFG_MII_DEFAULT_TSEC 1 #define CFG_TSEC1 1 #define CFG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" +#define CFG_TSEC2 1 +#define CFG_TSEC2_NAME "eTSEC2" #define TSEC1_PHY_ADDR 1 #define TSEC2_PHY_ADDR 3 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index eab8ade5c9ef..8747ef260b89 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -255,8 +255,8 @@ #define CFG_MII_DEFAULT_TSEC 3 #define CFG_TSEC1 1 #define CFG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" +#define CFG_TSEC2 1 +#define CFG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 1 #define CONFIG_TSEC3_NAME "eTSEC3" diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index fa446c725c88..dfb2679883a9 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -369,8 +369,8 @@ #if defined(CONFIG_TSEC_ENET) #define CFG_TSEC1 #define CFG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 -#define CONFIG_TSEC2_NAME "eTSEC2" +#define CFG_TSEC2 +#define CFG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 #define CONFIG_TSEC3_NAME "eTSEC3" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 310ac53d91a1..c4e7fdfa27fe 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -223,8 +223,8 @@ CFG_THOR_RESET_OFF CFG_TPM_TIS_BASE_ADDRESS CFG_TSEC1 CFG_TSEC1_NAME -CONFIG_TSEC2 -CONFIG_TSEC2_NAME +CFG_TSEC2 +CFG_TSEC2_NAME CONFIG_TSEC3 CONFIG_TSEC3_NAME CONFIG_TSEC4 -- 2.25.1