Skip to content

Commit 421f866

Browse files
YueHaibingkuba-moo
authored andcommitted
net: broadcom: Add PTP_1588_CLOCK_OPTIONAL dependency for BCMGENET under ARCH_BCM2835
commit 8d820bc ("net: broadcom: Fix BCMGENET Kconfig") fixes the build that contain 99addbe ("net: broadcom: Select BROADCOM_PHY for BCMGENET") and enable BCMGENET=y but PTP_1588_CLOCK_OPTIONAL=m, which otherwise leads to a link failure. However this may trigger a runtime failure. Fix the original issue by propagating the PTP_1588_CLOCK_OPTIONAL dependency of BROADCOM_PHY down to BCMGENET. Fixes: 8d820bc ("net: broadcom: Fix BCMGENET Kconfig") Fixes: 99addbe ("net: broadcom: Select BROADCOM_PHY for BCMGENET") Reported-by: Naresh Kamboju <[email protected]> Suggested-by: Arnd Bergmann <[email protected]> Signed-off-by: YueHaibing <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 01f856a commit 421f866

File tree

1 file changed

+2
-1
lines changed
  • drivers/net/ethernet/broadcom

1 file changed

+2
-1
lines changed

drivers/net/ethernet/broadcom/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,14 @@ config BCM63XX_ENET
7171
config BCMGENET
7272
tristate "Broadcom GENET internal MAC support"
7373
depends on HAS_IOMEM
74+
depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835
7475
select MII
7576
select PHYLIB
7677
select FIXED_PHY
7778
select BCM7XXX_PHY
7879
select MDIO_BCM_UNIMAC
7980
select DIMLIB
80-
select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL)
81+
select BROADCOM_PHY if ARCH_BCM2835
8182
help
8283
This driver supports the built-in Ethernet MACs found in the
8384
Broadcom BCM7xxx Set Top Box family chipset.

0 commit comments

Comments
 (0)