| Message ID | 1449492809-12555-1-git-send-email-thomas@wytron.com.tw |
|---|---|
| State | Accepted |
| Delegated to: | Marek Vasut |
| Headers | show |
Hi Marek, On 2015年12月07日 20:53, Thomas Chou wrote: > 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> > --- > v2 > remove the PHYLIB check as suggested by Marek. > > drivers/net/Kconfig | 1 + > drivers/net/designware.c | 4 ---- > include/configs/axs101.h | 1 - > include/configs/bf609-ezkit.h | 1 - > include/configs/galileo.h | 1 - > include/configs/socfpga_common.h | 1 - > include/configs/spear-common.h | 1 - > include/configs/stv0991.h | 1 - > include/configs/sunxi-common.h | 1 - > include/configs/tb100.h | 1 - > include/configs/x600.h | 1 - > 11 files changed, 1 insertion(+), 13 deletions(-) > Would you please pick this one? I didn't notice that it was delegated to me before I sent a PR for nios. Thanks. Best regards, Thomas
On Saturday, December 19, 2015 at 04:56:38 AM, Thomas Chou wrote: > Hi Marek, > > On 2015年12月07日 20:53, Thomas Chou wrote: > > 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> > > --- > > v2 > > > > remove the PHYLIB check as suggested by Marek. > > > > drivers/net/Kconfig | 1 + > > drivers/net/designware.c | 4 ---- > > include/configs/axs101.h | 1 - > > include/configs/bf609-ezkit.h | 1 - > > include/configs/galileo.h | 1 - > > include/configs/socfpga_common.h | 1 - > > include/configs/spear-common.h | 1 - > > include/configs/stv0991.h | 1 - > > include/configs/sunxi-common.h | 1 - > > include/configs/tb100.h | 1 - > > include/configs/x600.h | 1 - > > 11 files changed, 1 insertion(+), 13 deletions(-) > > Would you please pick this one? I didn't notice that it was delegated to > me before I sent a PR for nios. Thanks. You mean via socfpga ? Best regards, Marek Vasut
Hi Marek, On 2015年12月19日 13:47, Marek Vasut wrote: > On Saturday, December 19, 2015 at 04:56:38 AM, Thomas Chou wrote: >> Hi Marek, >> >> On 2015年12月07日 20:53, Thomas Chou wrote: >>> 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> >>> --- >>> v2 >>> >>> remove the PHYLIB check as suggested by Marek. >>> >>> drivers/net/Kconfig | 1 + >>> drivers/net/designware.c | 4 ---- >>> include/configs/axs101.h | 1 - >>> include/configs/bf609-ezkit.h | 1 - >>> include/configs/galileo.h | 1 - >>> include/configs/socfpga_common.h | 1 - >>> include/configs/spear-common.h | 1 - >>> include/configs/stv0991.h | 1 - >>> include/configs/sunxi-common.h | 1 - >>> include/configs/tb100.h | 1 - >>> include/configs/x600.h | 1 - >>> 11 files changed, 1 insertion(+), 13 deletions(-) >> >> Would you please pick this one? I didn't notice that it was delegated to >> me before I sent a PR for nios. Thanks. > > You mean via socfpga ? Yes, please. It was reported on socfpga. Best regards, Thomas
On Saturday, December 19, 2015 at 09:24:11 AM, Thomas Chou wrote: > Hi Marek, > > On 2015年12月19日 13:47, Marek Vasut wrote: > > On Saturday, December 19, 2015 at 04:56:38 AM, Thomas Chou wrote: > >> Hi Marek, > >> > >> On 2015年12月07日 20:53, Thomas Chou wrote: > >>> 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> > >>> --- > >>> v2 > >>> > >>> remove the PHYLIB check as suggested by Marek. > >>> > >>> drivers/net/Kconfig | 1 + > >>> drivers/net/designware.c | 4 ---- > >>> include/configs/axs101.h | 1 - > >>> include/configs/bf609-ezkit.h | 1 - > >>> include/configs/galileo.h | 1 - > >>> include/configs/socfpga_common.h | 1 - > >>> include/configs/spear-common.h | 1 - > >>> include/configs/stv0991.h | 1 - > >>> include/configs/sunxi-common.h | 1 - > >>> include/configs/tb100.h | 1 - > >>> include/configs/x600.h | 1 - > >>> 11 files changed, 1 insertion(+), 13 deletions(-) > >> > >> Would you please pick this one? I didn't notice that it was delegated to > >> me before I sent a PR for nios. Thanks. > > > > You mean via socfpga ? > > Yes, please. It was reported on socfpga. Applied, thanks! Best regards, Marek Vasut
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index a03a95d..4b04d09 100644 --- 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 a6c39c3..3af43b4 100644 --- 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 650d97d..eeb2ae6 100644 --- 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 0e353b9..b5d4847 100644 --- 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 eb16a5e..14a42b1 100644 --- 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 b3f65b6..86eccba 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -105,7 +105,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 1d69477..d2630f4 100644 --- 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 14c6a9e..f421321 100644 --- 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 98a2c74..31a68ac 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -312,7 +312,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 8660ed4..e06484f 100644 --- 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 58f1aca..0263c50 100644 --- 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 */