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 802B0C4332F for ; Sun, 20 Nov 2022 14:26:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2C5A4854EA; Sun, 20 Nov 2022 15:18:28 +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="OZOEi4xj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 72681854CF; Sun, 20 Nov 2022 15:18:08 +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 13484854A2 for ; Sun, 20 Nov 2022 15:17:55 +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 a27so5918894qtw.10 for ; Sun, 20 Nov 2022 06:17:55 -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=2bS+DiDQRtuMoLJ1o7xDgx5w4BOoSbXWl6dsmZLEIp4=; b=OZOEi4xjnrcGNZs+TBm7lymmFvtMcu22ste7geuI9a6vAQPG2ENjiY9YIaUfeDv+yK 8lM0TogjShe0wnIiulzmws1hPpT6FDZI+S1RJgrvKx+RhsvJeHhpOAgU0B9uljOJKe8Y yhSzWWmtURoAGexLrUhslNtJZpzrYzoXydUIo= 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=2bS+DiDQRtuMoLJ1o7xDgx5w4BOoSbXWl6dsmZLEIp4=; b=Q5k+UnKoM9C/7rw6LjZwaOzesOZMvIgqnn/nBYs4Av/UTWWZl0FxZ9nCDv3m+1LZIV hJ6aGSkoPBrW2uhA78ZT6zGmjNy0+p902UrlsZ6Zhdj6BTP6mVGt88iaVm62mzZte8kv FhV4Q5/gIp5biBzM1C4ZyfEsVjrqo7BIImOJqfQ6WMV3Ne51MhQstg5QCRt6xJrz1G1/ egByb+2FwMtJh9ZFv3AyJExA+xNqsY6B2ixDiA0xcYMYwmGUCezSZlvirBOCO/8Cq5PD eqtohUd0WvwiN2ZHopBeYbySqdfZ/QX0gzohM3Xzj8WvPtKMOVydeGspY/1x4RBFZaGE 0KHw== X-Gm-Message-State: ANoB5pmFj6uh/0JFsVlZ/7iw9J6fBNnZ0qjjzTLcPO939Ke4DxtYoQsZ rgDwtgNwU2G15CyPRTnMtFWMwh1APXWpjQ== X-Google-Smtp-Source: AA0mqf7c0eeGi6ETbsmpDPYXSd3giZQvFrUM/PBgWkeMFjj9/dkS9fj0ge7l9yE3+kvtbkO2+679MQ== X-Received: by 2002:a05:622a:429a:b0:3a1:e533:23a7 with SMTP id cr26-20020a05622a429a00b003a1e53323a7mr13664164qtb.197.1668953874539; Sun, 20 Nov 2022 06:17:54 -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.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:54 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 215/241] global: Migrate CONFIG_TSEC4 to CFG Date: Sun, 20 Nov 2022 09:17:17 -0500 Message-Id: <20221120141743.3059310-16-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 +- drivers/net/tsec.c | 2 +- include/configs/MPC8548CDS.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index ce60ec2c10f6..ad4d52a36e25 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -314,7 +314,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, switch_mask = PIXIS_VCFGEN1_TSEC3SER; break; #endif -#ifdef CONFIG_TSEC4 +#ifdef CFG_TSEC4 case 4: mask = PIXIS_VSPEED2_TSEC4SER; switch_mask = PIXIS_VCFGEN1_TSEC4SER; diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index cbe8e0ddca99..e7e271ee2d53 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -224,7 +224,7 @@ int board_eth_init(struct bd_info *bis) num++; } #endif -#ifdef CONFIG_TSEC4 +#ifdef CFG_TSEC4 /* initialize TSEC4 only if Carrier is 1.3 or above on CDS */ if (get_board_version() >= 0x13) { SET_STD_TSEC_INFO(tsec_info[num], 4); diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 985cde092bca..734e10c563e0 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -44,7 +44,7 @@ static struct tsec_info_struct tsec_info[] = { #ifdef CFG_TSEC3 STD_TSEC_INFO(3), /* TSEC3 */ #endif -#ifdef CONFIG_TSEC4 +#ifdef CFG_TSEC4 STD_TSEC_INFO(4), /* TSEC4 */ #endif }; diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 7bc8f238e05b..a493d73a4a82 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -291,8 +291,8 @@ #define CFG_TSEC2_NAME "eTSEC1" #define CFG_TSEC3 1 #define CFG_TSEC3_NAME "eTSEC2" -#define CONFIG_TSEC4 -#define CONFIG_TSEC4_NAME "eTSEC3" +#define CFG_TSEC4 +#define CFG_TSEC4_NAME "eTSEC3" #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a44112ccd25e..fa67d6fe3468 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -227,8 +227,8 @@ CFG_TSEC2 CFG_TSEC2_NAME CFG_TSEC3 CFG_TSEC3_NAME -CONFIG_TSEC4 -CONFIG_TSEC4_NAME +CFG_TSEC4 +CFG_TSEC4_NAME CONFIG_TSECV2 CONFIG_TSECV2_1 CONFIG_TSEC_TBICR_SETTINGS -- 2.25.1