summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorStefan Mavrodiev <stefan@olimex.com>2018-02-02 15:53:38 +0200
committerJagan Teki <jagan@amarulasolutions.com>2018-03-13 22:36:33 +0530
commitb30c4190407be9807f6b5fdcfd3a3d983a961dee (patch)
tree6dda77958901da0940c2fd61c596a2c9dcc92c94 /include/configs
parent2d53018a0ef268ba73aebe2441f1fd7c65533d78 (diff)
Move CONFIG_PHY_ADDR to Kconfig
CONFIG_PHY_ADDR is used for old-style configuration. This makes impossible changing the PHY address, if multiple boards share a same config header file (for example include/configs/sunxi-common.h). Moving this to Kconfig helps overcoming this issue. It's defined as entry inside PHYLIB section. After the implemention, moveconfig was run. The issues are: - edb9315a - CONFIG_PHYLIB is not enabled. Entry is deleted. - ds414 - CONFIG_PHYLIB is in incompatible format: { 0x1, 0x0 }. This entry is also deleted. - devkit3250 - The PHY_ADDR is in hex format (0x1F). Manually CONFIG_PHY_ADDR=31 is added in the defconfig. After the changes the suspicious defconfigs passes building. Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> [jagan: rebased on master] Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
Diffstat (limited to 'include/configs')
-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
12 files changed, 0 insertions, 16 deletions
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