sunxi: Fix PHY regression on A20-OLinuXino-Lime2 and A20-Olimex-SOM-EVB

Message ID 20200424190956.65b666fa@crub
State New
Headers show
Series
  • sunxi: Fix PHY regression on A20-OLinuXino-Lime2 and A20-Olimex-SOM-EVB
Related show

Commit Message

Anatolij Gustschin April 24, 2020, 5:09 p.m.
On Fri, 24 Apr 2020 12:34:05 -0400
Tom Rini trini at konsulko.com wrote:

> When moving the PHYLIB PHY drivers around in Kconfig we did not at the
> same time perform a careful migration of the related drivers and
> sub-options.  This lead to the case where previously Kconfig-enabled
> driver choices were now disabled on some platforms.  Correct this by
> enabling both the PHY driver and sub-option on the above referenced
> platforms.
> 
> Fixes: af2cbfd6b982 ("drivers: net: Provide Kconfig menu for PHYLIB")
> Fixes: 8728c97eff5b ("configs: Re-sync")
> Reported-by: Dario <dario86 at tutamail.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
> After checking back on the original commit I can see that these are the
> only two platforms to have been broken in the change.

configs/A20-OLinuXino-Lime2-eMMC_defconfig might need similar change.

We get many build warnings like:
include/configs/sunxi-common.h:276:0: warning: "CONFIG_PHY_REALTEK" redefined

Could you include following change to fix it?


Thanks!
Anatolij

Comments

Tom Rini April 24, 2020, 5:14 p.m. | #1
On Fri, Apr 24, 2020 at 07:09:56PM +0200, Anatolij Gustschin wrote:
> On Fri, 24 Apr 2020 12:34:05 -0400
> Tom Rini trini at konsulko.com wrote:
> 
> > When moving the PHYLIB PHY drivers around in Kconfig we did not at the
> > same time perform a careful migration of the related drivers and
> > sub-options.  This lead to the case where previously Kconfig-enabled
> > driver choices were now disabled on some platforms.  Correct this by
> > enabling both the PHY driver and sub-option on the above referenced
> > platforms.
> > 
> > Fixes: af2cbfd6b982 ("drivers: net: Provide Kconfig menu for PHYLIB")
> > Fixes: 8728c97eff5b ("configs: Re-sync")
> > Reported-by: Dario <dario86 at tutamail.com>
> > Signed-off-by: Tom Rini <trini at konsulko.com>
> > ---
> > After checking back on the original commit I can see that these are the
> > only two platforms to have been broken in the change.
> 
> configs/A20-OLinuXino-Lime2-eMMC_defconfig might need similar change.
> 
> We get many build warnings like:
> include/configs/sunxi-common.h:276:0: warning: "CONFIG_PHY_REALTEK" redefined
> 
> Could you include following change to fix it?
> 
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 0ef289fd64..f4bbce8443 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -273,8 +273,10 @@ extern int soft_i2c_gpio_scl;
>  /* Ethernet support */
>  
>  #ifdef CONFIG_SUN7I_GMAC
> +#ifndef CONFIG_PHY_REALTEK
>  #define CONFIG_PHY_REALTEK
>  #endif
> +#endif
>  
>  #ifdef CONFIG_USB_EHCI_HCD
>  #define CONFIG_USB_OHCI_NEW

The problem with that is that it's showing that this symbol, and a whole
host of others from af2cbfd6b982 need to be migrated over to defconfigs.

Patch

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 0ef289fd64..f4bbce8443 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -273,8 +273,10 @@  extern int soft_i2c_gpio_scl;
 /* Ethernet support */
 
 #ifdef CONFIG_SUN7I_GMAC
+#ifndef CONFIG_PHY_REALTEK
 #define CONFIG_PHY_REALTEK
 #endif
+#endif
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_OHCI_NEW