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 9136DC433FE for ; Sun, 20 Nov 2022 14:26:47 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78EA5854F4; Sun, 20 Nov 2022 15:18:38 +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="H/4Ml8Jw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2A447854C0; Sun, 20 Nov 2022 15:18:10 +0100 (CET) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 08938852FD for ; Sun, 20 Nov 2022 15:17:57 +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-x72e.google.com with SMTP id x18so6542912qki.4 for ; Sun, 20 Nov 2022 06:17:56 -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=aLCI8CO1SReYPZ7F4xZlBxfxt71HPl7OFYQb+y+CgxY=; b=H/4Ml8JwFrniRXI9d7znYgOE8236fREwcOZ92JShcXnniUETOnsWFSG9hNaBp0S5ZI TtADE3SrIxEO+8gp0T/tjn941/TzisALLvfEox1wgUmTcqp5vNmwcyz3Ee7PvVBP5Bdb Qrrqc/610y+ZsJF8rEoqlTvhvwSySPFL6BeGg= 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=aLCI8CO1SReYPZ7F4xZlBxfxt71HPl7OFYQb+y+CgxY=; b=VdQyhkkqLvFolQHumDUkElIGZLbzLLu3aUYsX0KDQQ/WoarBhBjBU/XcGRSvF4jcgD n5VJ5C/DylCvqHuLDYNhPdw3hXhGLHHXthCuSGPJNA3VigdVSSwOlDCyBLWPp/hfnNkn YTuOP8dj8dsths3LhiycQxNovhcQDdBTI+yoqU3Zp+JjomjtnRlQHsnPJk9faCi3YMh3 iNObgI68spzmrYyX/GyULtqFX6r6dZ0u2OlMTMgffgXryrULctGnaxrTwUG9b/Bvy5J3 nx+CUQ6b9/3mWnm4+6FqpxoZUTW+k30ilYKucL78YMAyarxN0xJFSfnSXdMN67ba/nv2 bTNg== X-Gm-Message-State: ANoB5plCku5g20fsezuFjfpm+AyBUtAUCXdiB8c4cglMc1t592g2GaLm 6c7Oxw/89QJKfHJqSCpsswp8uZ8oRm6sIg== X-Google-Smtp-Source: AA0mqf53AJYcQC8epPmyELEa/aFEQYMWC50b8w51rB4EBtH6o9/qnM6ho2w07k5YxaGZnSFrTxHO6g== X-Received: by 2002:ae9:ed4d:0:b0:6fa:f92:b2e6 with SMTP id c74-20020ae9ed4d000000b006fa0f92b2e6mr12911435qkg.677.1668953875753; Sun, 20 Nov 2022 06:17:55 -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.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:55 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 217/241] global: Migrate CONFIG_TSEC_TBICR_SETTINGS to CFG Date: Sun, 20 Nov 2022 09:17:19 -0500 Message-Id: <20221120141743.3059310-18-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 --- drivers/net/tsec.c | 8 ++++---- include/configs/P1010RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 734e10c563e0..7ad690a1c875 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -57,14 +57,14 @@ static struct tsec_info_struct tsec_info[] = { ) /* By default force the TBI PHY into 1000Mbps full duplex when in SGMII mode */ -#ifndef CONFIG_TSEC_TBICR_SETTINGS -#define CONFIG_TSEC_TBICR_SETTINGS ( \ +#ifndef CFG_TSEC_TBICR_SETTINGS +#define CFG_TSEC_TBICR_SETTINGS ( \ TBICR_PHY_RESET \ | TBICR_ANEG_ENABLE \ | TBICR_FULL_DUPLEX \ | TBICR_SPEED1_SET \ ) -#endif /* CONFIG_TSEC_TBICR_SETTINGS */ +#endif /* CFG_TSEC_TBICR_SETTINGS */ /* Configure the TBI for SGMII operation */ static void tsec_configure_serdes(struct tsec_private *priv) @@ -78,7 +78,7 @@ static void tsec_configure_serdes(struct tsec_private *priv) tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa), 0, TBI_TBICON, TBICON_CLK_SELECT); tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa), - 0, TBI_CR, CONFIG_TSEC_TBICR_SETTINGS); + 0, TBI_CR, CFG_TSEC_TBICR_SETTINGS); } /* the 'way' for ethernet-CRC-32. Spliced in from Linux lib/crc32.c diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index dd8dd42b54d5..91e5c544f616 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -371,7 +371,7 @@ extern unsigned long get_sdram_size(void); #define TSEC3_PHYIDX 0 /* TBI PHY configuration for SGMII mode */ -#define CONFIG_TSEC_TBICR_SETTINGS ( \ +#define CFG_TSEC_TBICR_SETTINGS ( \ TBICR_PHY_RESET \ | TBICR_ANEG_ENABLE \ | TBICR_FULL_DUPLEX \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1d60965b520c..bd8a5af65985 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -231,7 +231,7 @@ CFG_TSEC4 CFG_TSEC4_NAME CFG_TSECV2 CFG_TSECV2_1 -CONFIG_TSEC_TBICR_SETTINGS +CFG_TSEC_TBICR_SETTINGS CONFIG_UBIFS_VOLUME CONFIG_UBI_PART CONFIG_UBOOTPATH -- 2.25.1