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 29488C433FE for ; Sun, 20 Nov 2022 14:25:07 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5DC15854D1; Sun, 20 Nov 2022 15:18:15 +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="JnGc+0AT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 66629854BB; Sun, 20 Nov 2022 15:17:58 +0100 (CET) Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (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 030FA8533B 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-qt1-x830.google.com with SMTP id a27so5918854qtw.10 for ; Sun, 20 Nov 2022 06:17:52 -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=6Khl6Kpc40tbozFw+ROn+Mdv9fW5QXkDajTN3xHYgjE=; b=JnGc+0ATvOSOW8wI3gCbUzQNJEZRo67SV5D4sctMJ1AO4BLsAWNvVPCvwaeW4QcWc6 KvTZD9CBL9aS7NP4pTKfLvUtv5u/BgbYhyMm1VSyHa2aQP+PCu0g7CVdkru1swxIuHsh odIfc3rZTttogExAAp5IY0G3BF4riWMWtX250= 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=6Khl6Kpc40tbozFw+ROn+Mdv9fW5QXkDajTN3xHYgjE=; b=Q7oc5ad14dpTg7pFFlMyWbDxQPBfs5g2Iz+22kKsgIzqxljYlNIlZD2qltGWJMsU93 zqRhqCX2hEI/k8pcNbNTLFMYa6/JXxt0bMmm0cfDYll4j4B31CQXWJg2ySAJB1ZFKMgI 3Dj3ZGMm3W1oGokjlt57j/ScBaHzGYzNbqCVGSuexvjgk9Ga7ZC69yfKTHTi1jGWDp1X k4LRQhHOCQYBwK3rvwXtUWpup9PB6U9flDD+4JNFD9qN+jiGpgmQJ7ytyLKfg6cfKj72 5hgLZq2HwRmXF1fgksJAAczRwsrKh/36vH50a/R1st+09Q6UQJQGln1fBm30maCjszQj hhTA== X-Gm-Message-State: ANoB5pmWdp88YcF6ncvRs1VAgHC0k8veeWUfbbh6k8pqMhTAm5TKP7Bi RcKxPrSYOwviv4oQzncJxLt5RNeLSb0FoQ== X-Google-Smtp-Source: AA0mqf5OTxQ7dLqkxjv6IGzxHo3Y/oCgJb7rv6Vz/Cde81RCvqkFWAV7Vu7yTqBQfMAfBvOYzDFtaQ== X-Received: by 2002:ac8:455a:0:b0:39c:e448:e7c2 with SMTP id z26-20020ac8455a000000b0039ce448e7c2mr13724493qtn.677.1668953872440; Sun, 20 Nov 2022 06:17:52 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:51 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 212/241] global: Migrate CONFIG_TSEC1 to CFG Date: Sun, 20 Nov 2022 09:17:14 -0500 Message-Id: <20221120141743.3059310-13-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 ++-- include/configs/socrates.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index 6fdb11039e54..37d502f7ff4b 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -296,7 +296,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, which_tsec = simple_strtoul(argv[1], NULL, 0); switch (which_tsec) { -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 case 1: mask = PIXIS_VSPEED2_TSEC1SER; switch_mask = PIXIS_VCFGEN1_TSEC1SER; diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 73e024eaa011..4c10b1075e53 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -208,7 +208,7 @@ int board_eth_init(struct bd_info *bis) struct tsec_info_struct tsec_info[4]; int num = 0; -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO(tsec_info[num], 1); num++; #endif diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index 0f014823c935..a527d44d6865 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -489,7 +489,7 @@ int board_eth_init(struct bd_info *bis) cpu = gd->arch.cpu; -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO(tsec_info[num], 1); 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 9e26c201b7a8..7d2b8ec12d9f 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 @@ -373,7 +373,7 @@ int board_eth_init(struct bd_info *bis) (void *)(CFG_SYS_MPC85xx_GUTS_ADDR); int num = 0; -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO(tsec_info[num], 1); num++; #endif diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 8b6f034ea165..ad2c68e2a73d 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -26,7 +26,7 @@ /* Default initializations for TSEC controllers. */ static struct tsec_info_struct tsec_info[] = { -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 STD_TSEC_INFO(1), /* TSEC1 */ #endif #ifdef CONFIG_TSEC2 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2ca7862147de..82101ced5323 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -185,10 +185,10 @@ #define CFG_GMII /* MII PHY management */ -#define CONFIG_TSEC1 +#define CFG_TSEC1 -#ifdef CONFIG_TSEC1 -#define CONFIG_TSEC1_NAME "TSEC0" +#ifdef CFG_TSEC1 +#define CFG_TSEC1_NAME "TSEC0" #define CFG_SYS_TSEC1_OFFSET 0x24000 #define TSEC1_PHY_ADDR 2 #define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index d47378e19352..53639db0b9dd 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -285,8 +285,8 @@ #if defined(CONFIG_TSEC_ENET) -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC0" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC0" #define CONFIG_TSEC2 1 #define CONFIG_TSEC2_NAME "eTSEC1" #define CONFIG_TSEC3 1 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 04f270e11806..88865aac01eb 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -351,8 +351,8 @@ extern unsigned long get_sdram_size(void); #if defined(CONFIG_TSEC_ENET) #define CFG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 #define CONFIG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 1 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 08532dc3e0aa..fff4e816ecc1 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -72,8 +72,8 @@ #ifdef CONFIG_TSEC_ENET #define CFG_MII_DEFAULT_TSEC 1 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 #define CONFIG_TSEC2_NAME "eTSEC2" diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 498c89c3cf21..eab8ade5c9ef 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -253,8 +253,8 @@ #ifdef CONFIG_TSEC_ENET #define CFG_MII_DEFAULT_TSEC 3 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 #define CONFIG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 1 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 4ab2efd528d1..fa446c725c88 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -367,8 +367,8 @@ #endif /* CONFIG_PCI */ #if defined(CONFIG_TSEC_ENET) -#define CONFIG_TSEC1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 +#define CFG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 #define CONFIG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 diff --git a/include/configs/socrates.h b/include/configs/socrates.h index ddbd257d08a5..bfba9782405f 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -111,8 +111,8 @@ #define CFG_SYS_PCI1_MEM_PHYS 0x80000000 #define CFG_SYS_PCI1_IO_PHYS 0xE2000000 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "TSEC0" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "TSEC0" #define CONFIG_TSEC3 1 #define CONFIG_TSEC3_NAME "TSEC1" #undef CONFIG_MPC85XX_FEC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 34a34a2f0776..310ac53d91a1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -221,8 +221,8 @@ CFG_TESTPIN_MASK CFG_TESTPIN_REG CFG_THOR_RESET_OFF CFG_TPM_TIS_BASE_ADDRESS -CONFIG_TSEC1 -CONFIG_TSEC1_NAME +CFG_TSEC1 +CFG_TSEC1_NAME CONFIG_TSEC2 CONFIG_TSEC2_NAME CONFIG_TSEC3 -- 2.25.1