net: eth_designware: select PHYLIB in Kconfig

Select PHYLIB in drivers/net/Kconfig. And remove CONFIG_PHYLIB
from legacy board header files.

This fixed the warnings when both ALTERA_TSE and ETH_DESIGNWARE
are selected.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reported-by: Pavel Machek <pavel@denx.de>
Acked-by: Chin Liang See <clsee@altera.com>
Acked-by: Pavel Machek <pavel@denx.de>
Tested-by: Pavel Machek <pavel@denx.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ae5e78dd3449c4a2faa1afaf5c773bb0e560789c..de54ca8014c76ee80d74ef293120dba36fedf6c5 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -88,6 +88,7 @@ config ETH_SANDBOX_RAW
 
 config ETH_DESIGNWARE
        bool "Synopsys Designware Ethernet MAC"
+       select PHYLIB
        help
          This MAC is present in SoCs from various vendors. It supports
          100Mbit and 1 Gbit operation. You must enable CONFIG_PHYLIB to

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index a6c39c39ffaaee82f40f31dbf6c9ada59b3ce745..3af43b41fdd49cd0835ca12d357577f223d09a50 100644 (file)
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -22,10 +22,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CONFIG_PHYLIB)
-# error "DesignWare Ether MAC requires PHYLIB - missing CONFIG_PHYLIB"
-#endif
-
 static int dw_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
 {
        struct eth_mac_regs *mac_p = bus->priv;

diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 650d97d17f23e9d8c8f18a5b2c0f68fbf23bf0a9..eeb2ae63530af363c9d5cb233a365a83e224f2c5 100644 (file)
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -95,7 +95,6 @@
 /*
  * Ethernet PHY configuration
  */
-#define CONFIG_PHYLIB
 #define CONFIG_MII
 #define CONFIG_PHY_GIGE
 

diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 0e353b99411f02d511b49e2bfa514f5bcc7ec542..b5d484752374199726025e64799343e182610462 100644 (file)
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -75,7 +75,6 @@
 #define CONFIG_DW_ALTDESCRIPTOR
 #define CONFIG_CMD_MII
 #define CONFIG_MII
-#define CONFIG_PHYLIB
 
 /* i2c Settings */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index eb16a5eacac4ea06f4abbc2aff0fa01aae76a792..14a42b1d400453c41ff530536a955f1a528dd945 100644 (file)
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -45,7 +45,6 @@
 /* 10/100M Ethernet support */
 #define CONFIG_DESIGNWARE_ETH
 #define CONFIG_DW_ALTDESCRIPTOR
-#define CONFIG_PHYLIB
 
 /* Environment configuration */
 #define CONFIG_ENV_SECT_SIZE           0x1000

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 3a4df63ef1fc804cd19d5268493a82819b6cf4ec..1da2ecf1e11447c7028fabaecbc0204d951b37fd 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -109,7 +109,6 @@
 #define CONFIG_DW_ALTDESCRIPTOR
 #define CONFIG_MII
 #define CONFIG_AUTONEG_TIMEOUT         (15 * CONFIG_SYS_HZ)
-#define CONFIG_PHYLIB
 #define CONFIG_PHY_GIGE
 #endif
 

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 1d69477e6133afe254c6c5cdc7caab367e8acb4a..d2630f4be1daaf2c61a32299190b2232fef99470 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -17,7 +17,6 @@
 
 /* Ethernet driver configuration */
 #define CONFIG_MII
-#define CONFIG_PHYLIB
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */
 

diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 14c6a9edf5767d64103a4733a7c63d0b4ddbd660..f4213217bbbdef291ffb6e17999e303faea617b9 100644 (file)
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -53,7 +53,6 @@
 /* GMAC related configs */
 
 #define CONFIG_MII
-#define CONFIG_PHYLIB
 #define CONFIG_DW_ALTDESCRIPTOR
 #define CONFIG_PHY_MICREL
 

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index da6ab61d1bc53956b7967862f55817762914ea29..46f799422211b7a033f24fda981937c309bdfff0 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -313,7 +313,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_PHY_GIGE                        /* GMAC can use gigabit PHY     */
 #define CONFIG_PHY_ADDR                1
 #define CONFIG_MII                     /* MII PHY management           */
-#define CONFIG_PHYLIB
 #endif
 
 #ifdef CONFIG_USB_EHCI_HCD

diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 8660ed45e00ec2bfd8b889acda2d27861a9e81bd..e06484f861879a9981d98bfd6dd5a8686347d60e 100644 (file)
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -42,7 +42,6 @@
 /*
  * Ethernet PHY configuration
  */
-#define CONFIG_PHYLIB
 #define CONFIG_PHY_GIGE
 
 /*

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 58f1aca9a028c02e7fc271cec48056f02fd3f45c..0263c50e13b2a05fc33f4df61c5e60ddfb4b3a0e 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -77,7 +77,6 @@
 
 /* Ethernet config options */
 #define CONFIG_MII
-#define CONFIG_PHYLIB
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_ADDR                0       /* PHY address */
 #define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */