| Message ID | 1453903507-3427225-4-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
[[PATCH 3/9] net: bgmac: clarify CONFIG_BCMA dependency] On 27/01/2016 (Wed 15:04) Arnd Bergmann wrote: > The bgmac driver depends on BCMA_HOST_SOC, which is only used > when CONFIG_BCMA is enabled. However, it is a bool option and can > be set when CONFIG_BCMA=m, and then bgmac can be built-in, leading > to an obvious link error: > > drivers/built-in.o: In function `bgmac_init': > :(.init.text+0x7f2c): undefined reference to `__bcma_driver_register' > drivers/built-in.o: In function `bgmac_exit': > :(.exit.text+0x110a): undefined reference to `bcma_driver_unregister' > > To avoid this case, we need to depend on both BCMA and BCMA_SOC, > as this patch does. I'm also trying to make the dependency more > readable by splitting it into three lines, and adding a COMPILE_TEST > alternative so we can test-build it in all configurations that > support BCMA. It wasn't immediately clear to me from the above why you added the select on FIXED_PHY. P. -- > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/net/ethernet/broadcom/Kconfig | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig > index 8550df189ceb..19f7cd02e085 100644 > --- a/drivers/net/ethernet/broadcom/Kconfig > +++ b/drivers/net/ethernet/broadcom/Kconfig > @@ -151,8 +151,11 @@ config BNX2X_VXLAN > > config BGMAC > tristate "BCMA bus GBit core support" > - depends on BCMA_HOST_SOC && HAS_DMA && (BCM47XX || ARCH_BCM_5301X) > + depends on BCMA && BCMA_HOST_SOC > + depends on HAS_DMA > + depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST > select PHYLIB > + select FIXED_PHY > ---help--- > This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus. > They can be found on BCM47xx SoCs and provide gigabit ethernet. > -- > 2.7.0 >
On Wednesday 27 January 2016 11:11:10 Paul Gortmaker wrote: > [[PATCH 3/9] net: bgmac: clarify CONFIG_BCMA dependency] On 27/01/2016 (Wed 15:04) Arnd Bergmann wrote: > > > The bgmac driver depends on BCMA_HOST_SOC, which is only used > > when CONFIG_BCMA is enabled. However, it is a bool option and can > > be set when CONFIG_BCMA=m, and then bgmac can be built-in, leading > > to an obvious link error: > > > > drivers/built-in.o: In function `bgmac_init': > > :(.init.text+0x7f2c): undefined reference to `__bcma_driver_register' > > drivers/built-in.o: In function `bgmac_exit': > > :(.exit.text+0x110a): undefined reference to `bcma_driver_unregister' > > > > To avoid this case, we need to depend on both BCMA and BCMA_SOC, > > as this patch does. I'm also trying to make the dependency more > > readable by splitting it into three lines, and adding a COMPILE_TEST > > alternative so we can test-build it in all configurations that > > support BCMA. > > It wasn't immediately clear to me from the above why you added the > select on FIXED_PHY. > Right, I'll resend the patch with improved changelog. This series is mostly patches for old and rare randconfig bugs, so I had built thousands of configurations and fixed up everything until new warnings or errors kept coming up. The FIXED_PHY error came up in the same driver so I merged the two patches but did not notice how the changelog failed to explain it. Thanks, Arnd
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig index 8550df189ceb..19f7cd02e085 100644 --- a/drivers/net/ethernet/broadcom/Kconfig +++ b/drivers/net/ethernet/broadcom/Kconfig @@ -151,8 +151,11 @@ config BNX2X_VXLAN config BGMAC tristate "BCMA bus GBit core support" - depends on BCMA_HOST_SOC && HAS_DMA && (BCM47XX || ARCH_BCM_5301X) + depends on BCMA && BCMA_HOST_SOC + depends on HAS_DMA + depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST select PHYLIB + select FIXED_PHY ---help--- This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus. They can be found on BCM47xx SoCs and provide gigabit ethernet.
The bgmac driver depends on BCMA_HOST_SOC, which is only used when CONFIG_BCMA is enabled. However, it is a bool option and can be set when CONFIG_BCMA=m, and then bgmac can be built-in, leading to an obvious link error: drivers/built-in.o: In function `bgmac_init': :(.init.text+0x7f2c): undefined reference to `__bcma_driver_register' drivers/built-in.o: In function `bgmac_exit': :(.exit.text+0x110a): undefined reference to `bcma_driver_unregister' To avoid this case, we need to depend on both BCMA and BCMA_SOC, as this patch does. I'm also trying to make the dependency more readable by splitting it into three lines, and adding a COMPILE_TEST alternative so we can test-build it in all configurations that support BCMA. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/broadcom/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)