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

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@tutamail.com Signed-off-by: Tom Rini trini@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_defconfig | 2 ++ configs/A20-Olimex-SOM-EVB_defconfig | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index 2b082cab595d..28b558cbeb6d 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -18,6 +18,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2" CONFIG_SCSI_AHCI=y CONFIG_DFU_RAM=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_PHY_REALTEK=y +CONFIG_RTL8211X_PHY_FORCE_MASTER=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_MII=y diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig index 5b5ed3bb0a97..56f6ad82755b 100644 --- a/configs/A20-Olimex-SOM-EVB_defconfig +++ b/configs/A20-Olimex-SOM-EVB_defconfig @@ -15,6 +15,8 @@ CONFIG_AHCI=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb" CONFIG_SCSI_AHCI=y +CONFIG_PHY_REALTEK=y +CONFIG_RTL8211X_PHY_FORCE_MASTER=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_MII=y

On Fri, 24 Apr 2020 12:34:05 -0400 Tom Rini trini@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@tutamail.com Signed-off-by: Tom Rini trini@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
Thanks! Anatolij

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@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@tutamail.com Signed-off-by: Tom Rini trini@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.

On Fri, Apr 24, 2020 at 12:34:05PM -0400, Tom Rini 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@tutamail.com Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Anatolij Gustschin
-
Tom Rini