summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README4
-rw-r--r--configs/devkit3250_defconfig1
-rw-r--r--configs/khadas-vim_defconfig1
-rw-r--r--configs/libretech-cc_defconfig1
-rw-r--r--configs/p212_defconfig1
-rw-r--r--drivers/net/phy/Kconfig7
-rw-r--r--include/configs/am335x_shc.h1
-rw-r--r--include/configs/baltos.h1
-rw-r--r--include/configs/devkit3250.h1
-rw-r--r--include/configs/ds414.h1
-rw-r--r--include/configs/edb93xx.h1
-rw-r--r--include/configs/khadas-vim.h2
-rw-r--r--include/configs/libretech-cc.h2
-rw-r--r--include/configs/p212.h2
-rw-r--r--include/configs/pepper.h1
-rw-r--r--include/configs/sunxi-common.h2
-rw-r--r--include/configs/work_92105.h1
-rw-r--r--include/configs/x600.h1
-rw-r--r--scripts/config_whitelist.txt1
19 files changed, 11 insertions, 21 deletions
diff --git a/README b/README
index 5cf90a482a8..5fd6428c5cd 100644
--- a/README
+++ b/README
@@ -1420,10 +1420,6 @@ The following options need to be configured:
be at least 4MB.
- MII/PHY support:
- CONFIG_PHY_ADDR
-
- The address of PHY on MII bus.
-
CONFIG_PHY_CLOCK_FREQ (ppc4xx)
The clock frequency of the MII bus
diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig
index fcc80b2027b..e1a9b4982a9 100644
--- a/configs/devkit3250_defconfig
+++ b/configs/devkit3250_defconfig
@@ -36,6 +36,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_NAND=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y
CONFIG_LPC32XX_SSP=y
diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig
index a0b3f8d1612..f4674efb689 100644
--- a/configs/khadas-vim_defconfig
+++ b/configs/khadas-vim_defconfig
@@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
CONFIG_MMC_MESON_GX=y
+CONFIG_PHY_ADDR=8
CONFIG_PHY_MESON_GXL=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig
index a7177b92484..18ddb45d956 100644
--- a/configs/libretech-cc_defconfig
+++ b/configs/libretech-cc_defconfig
@@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
CONFIG_MMC_MESON_GX=y
+CONFIG_PHY_ADDR=8
CONFIG_PHY_MESON_GXL=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/p212_defconfig b/configs/p212_defconfig
index d276e061542..b6923f3a673 100644
--- a/configs/p212_defconfig
+++ b/configs/p212_defconfig
@@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
CONFIG_MMC_MESON_GX=y
+CONFIG_PHY_ADDR=8
CONFIG_PHY_MESON_GXL=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 7fd4a8d2616..25de3fb2266 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -13,6 +13,13 @@ menuconfig PHYLIB
if PHYLIB
+config PHY_ADDR
+ int "PHY address"
+ default 1 if ARCH_SUNXI
+ default 0
+ help
+ The address of PHY on MII bus. Usually in range of 0 to 31.
+
config B53_SWITCH
bool "Broadcom BCM53xx (RoboSwitch) Ethernet switch PHY support."
help
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 55e803bc9f2..efa4c997ee7 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -258,7 +258,6 @@
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_PHY_ADDR 0
#define CONFIG_PHY_SMSC
/* I2C configuration */
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 5766a36f910..943a6f819dc 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -282,7 +282,6 @@
#endif
/* Network. */
-#define CONFIG_PHY_ADDR 0
#define CONFIG_PHY_SMSC
#define CONFIG_MII
#define CONFIG_PHY_ATHEROS
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 40dee673871..23841e0cadb 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -71,7 +71,6 @@
#define CONFIG_RMII
#define CONFIG_PHY_SMSC
#define CONFIG_LPC32XX_ETH
-#define CONFIG_PHY_ADDR 0x1F
#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
/*
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 69217143f98..ce520b23dea 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -40,7 +40,6 @@
#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */
#define CONFIG_PHY_MARVELL /* there is a marvell phy */
-#define CONFIG_PHY_ADDR { 0x1, 0x0 }
#define CONFIG_SYS_NETA_INTERFACE_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_SYS_ALT_MEMTEST
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 18ec6cb7583..0d4ec5c1012 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -95,7 +95,6 @@
#define CONFIG_DRIVER_EP93XX_MAC
#define CONFIG_MII_SUPPRESS_PREAMBLE
#define CONFIG_MII
-#define CONFIG_PHY_ADDR 1
#undef CONFIG_NETCONSOLE
/* SDRAM configuration */
diff --git a/include/configs/khadas-vim.h b/include/configs/khadas-vim.h
index 9d99bc5dc7c..f44b388b323 100644
--- a/include/configs/khadas-vim.h
+++ b/include/configs/khadas-vim.h
@@ -12,8 +12,6 @@
#define CONFIG_MISC_INIT_R
-#define CONFIG_PHY_ADDR 8
-
#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-khadas-vim.dtb\0"
#include <configs/meson-gxbb-common.h>
diff --git a/include/configs/libretech-cc.h b/include/configs/libretech-cc.h
index ffaca2648b8..08dfb30de07 100644
--- a/include/configs/libretech-cc.h
+++ b/include/configs/libretech-cc.h
@@ -12,8 +12,6 @@
#define CONFIG_MISC_INIT_R
-#define CONFIG_PHY_ADDR 8
-
#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-libretech-cc.dtb\0"
#include <configs/meson-gxbb-common.h>
diff --git a/include/configs/p212.h b/include/configs/p212.h
index 793b5568003..04773843e40 100644
--- a/include/configs/p212.h
+++ b/include/configs/p212.h
@@ -12,8 +12,6 @@
#define CONFIG_MISC_INIT_R
-#define CONFIG_PHY_ADDR 8
-
/* Serial setup */
#define CONFIG_CONS_INDEX 0
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 7ef25294c11..960afa0b3ad 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -77,7 +77,6 @@
#define CONFIG_SYS_NS16550_COM1 0x44e09000
/* Ethernet support */
-#define CONFIG_PHY_ADDR 0
#define CONFIG_PHY_RESET_DELAY 1000
/* SPL */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index e4e7c227784..9d9e9ce1734 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -288,12 +288,10 @@ extern int soft_i2c_gpio_scl;
/* Ethernet support */
#ifdef CONFIG_SUN4I_EMAC
-#define CONFIG_PHY_ADDR 1
#define CONFIG_MII /* MII PHY management */
#endif
#ifdef CONFIG_SUN7I_GMAC
-#define CONFIG_PHY_ADDR 1
#define CONFIG_MII /* MII PHY management */
#define CONFIG_PHY_REALTEK
#endif
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index cabd8156fa1..1374370187b 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -56,7 +56,6 @@
#define CONFIG_PHY_SMSC
#define CONFIG_LPC32XX_ETH
-#define CONFIG_PHY_ADDR 0
#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
/* FIXME: remove "Waiting for PHY auto negotiation to complete..." message */
diff --git a/include/configs/x600.h b/include/configs/x600.h
index bfa6f5e3fb8..d80db6a9142 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -70,7 +70,6 @@
/* Ethernet config options */
#define CONFIG_MII
#define CONFIG_PHY_RESET_DELAY 10000 /* in usec */
-#define CONFIG_PHY_ADDR 0 /* PHY address */
#define CONFIG_SPEAR_GPIO
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3606585c05c..b0958d7a802 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1541,7 +1541,6 @@ CONFIG_PERIF2_FREQ
CONFIG_PERIF3_FREQ
CONFIG_PERIF4_FREQ
CONFIG_PHYSMEM
-CONFIG_PHY_ADDR
CONFIG_PHY_BASE_ADR
CONFIG_PHY_BCM5421S
CONFIG_PHY_ET1011C_TX_CLK_FIX
generated by cgit v1.2.3 (git 2.0.4) at 2024-10-02 02:46:45 +0000