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 D1A2CC433FE for ; Sun, 20 Nov 2022 14:14:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E8C76853C2; Sun, 20 Nov 2022 15:09:45 +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="QE/GlkAy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C330E852CE; Sun, 20 Nov 2022 15:08:55 +0100 (CET) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 B5E158529D for ; Sun, 20 Nov 2022 15:08:51 +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-x72f.google.com with SMTP id i9so6515802qki.10 for ; Sun, 20 Nov 2022 06:08:51 -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=IwLOFPeQ/sTF632iz/BwwxQ4VgbO9RpuEKZO8cbysKA=; b=QE/GlkAyueuoIhf/ohyLT6y2gkq+bVOxBsNeB9eg3uSGzZJntLYlEfJ+j6LQXt+TRY 17l5SebOQmevn4EddtzlQI3kPa2MEvcAHJQaqZhypOUb9q2vt0+xMq1pF6DAnBB7zLIs M3Q7ZbnGhehZea3ITokw+MMwt7zsvwyDFBEOw= 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=IwLOFPeQ/sTF632iz/BwwxQ4VgbO9RpuEKZO8cbysKA=; b=LyXKX07mK5gYxd2xgeiBgN1tQzfPyNb6mbSOjZIbonF/9WzbUYSTDa6z4G9Y8JODw9 6LC1PcXaYaNV8ObiqCF5KVGEE/NjyFkESoCXMDj/VMZbuwUt0pTIAHJrMiGL0hLk8De5 YBDw+VxdBL+mapsnoMC6rOVqZZ7GhOxtQTOmqSV5zE3KKmosRK8aKsYDlIrF7FCGSOZM VtkWPTcwgTtua0cOc4I+vZbdC2ZiSf6gtFgYbftSs4blkPnLX4BlT3Kyg5l4Ak4aDCYS rZNxKQ0m+6wre79FYG5o7q5EDrBJty5R/AhYOzTT04EPEHlEptUVoYr1C7C40LwWls7O 36Xw== X-Gm-Message-State: ANoB5pnc/ziA08IXiQj9tWCE5jcQPSad8l5edOCbCRqxceIkLpWdtmXE 66hN96B+6Z7ZeoVDU0Z8bibEDGxSbHfAog== X-Google-Smtp-Source: AA0mqf7dUYi2YaIwnwqCWc3tYs81/pvBMO3kO8pndbMMnEEud6S1gxoZqH8mTFGqaTzWnnaJoS//LA== X-Received: by 2002:a05:620a:15d2:b0:6fa:6c8f:a54b with SMTP id o18-20020a05620a15d200b006fa6c8fa54bmr13000063qkm.431.1668953331084; Sun, 20 Nov 2022 06:08:51 -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-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.08.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:50 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 144/241] global: Migrate CONFIG_PHY_BASE_ADR to CFG Date: Sun, 20 Nov 2022 09:07:34 -0500 Message-Id: <20221120140829.3057894-35-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-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/mvgbe.h | 4 ++-- include/configs/SBx81LIFKW.h | 2 +- include/configs/SBx81LIFXCAT.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/openrd.h | 4 ++-- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/sheevaplug.h | 2 +- scripts/config_whitelist.txt | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h index 44541c0a85e3..bc0c32957204 100644 --- a/drivers/net/mvgbe.h +++ b/drivers/net/mvgbe.h @@ -12,8 +12,8 @@ #define __MVGBE_H__ /* PHY_BASE_ADR is board specific and can be configured */ -#if defined (CONFIG_PHY_BASE_ADR) -#define PHY_BASE_ADR CONFIG_PHY_BASE_ADR +#if defined (CFG_PHY_BASE_ADR) +#define PHY_BASE_ADR CFG_PHY_BASE_ADR #else #define PHY_BASE_ADR 0x08 /* default phy base addr */ #endif diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index 861ae530336a..3585d5f1b021 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -44,7 +44,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable a single port */ -#define CONFIG_PHY_BASE_ADR 0x01 +#define CFG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_SBX81LIFKW_H */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 418221ca72b3..4b1c9f995fb0 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -49,7 +49,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable a single port */ -#define CONFIG_PHY_BASE_ADR 0x01 +#define CFG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_SBX81LIFXCAT_H */ diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 68afe96239e6..bef274431261 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -32,6 +32,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_DOCKSTAR_H */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 2b312e52b135..c258eadd6d9b 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -28,6 +28,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_DREAMPLUG_H */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index a5f62497a731..123ebf751f37 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -40,7 +40,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable one port */ -#define CONFIG_PHY_BASE_ADR 8 +#define CFG_PHY_BASE_ADR 8 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_DS109_H */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index c10e991d6589..10f2715c8b2a 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -40,6 +40,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_GOFLEXHOME_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index b21151e312c9..f78981c5b4e6 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -35,7 +35,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_GURUPLUG_H */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 5eeaeadd4bec..3dab13863051 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -29,7 +29,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* CONFIG_CMD_NET */ /* diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 12f8a3c933cc..bb0813053256 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -23,7 +23,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 11 +#define CFG_PHY_BASE_ADR 11 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_ICONNECT_H */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index bfa132dbfe58..149a1e20af40 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -44,7 +44,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 8 +#define CFG_PHY_BASE_ADR 8 #endif /* CONFIG_CMD_NET */ /* diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 85cbd0bab07d..765268cba3ca 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -48,6 +48,6 @@ /* Ethernet driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 1 +#define CFG_PHY_BASE_ADR 1 #endif /* _CONFIG_NSA310S_H */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 1d1915a98520..413ca37e861d 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -43,10 +43,10 @@ # define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ # endif # ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE -# define CONFIG_PHY_BASE_ADR 0x0 +# define CFG_PHY_BASE_ADR 0x0 # define PHY_NO "88E1121" # else -# define CONFIG_PHY_BASE_ADR 0x8 +# define CFG_PHY_BASE_ADR 0x8 # define PHY_NO "88E1116" # endif #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index c48590123bd2..17fb475f56a7 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -27,6 +27,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_POGO_E02_H */ diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index 5d26a45f1426..9d6064f1e631 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -73,6 +73,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_POGO_V4_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index d4d968285fbd..9f78e1ac9a27 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -25,6 +25,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_SHEEVAPLUG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ca5faaeea1a3..5788c297fc21 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -153,7 +153,7 @@ CFG_OVERWRITE_ETHADDR_ONCE CFG_PCIE_IMX_PERST_GPIO CFG_PCIE_IMX_POWER_GPIO CFG_PEN_ADDR_BIG_ENDIAN -CONFIG_PHY_BASE_ADR +CFG_PHY_BASE_ADR CONFIG_PHY_ET1011C_TX_CLK_FIX CONFIG_PHY_ID CONFIG_PHY_INTERFACE_MODE -- 2.25.1