Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a856397 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by David S. Miller
Browse files

[FS_ENET]: Fix module build. 



If fs_enet is build as module, on PPC_CPM_NEW_BINDING platforms
mii-fec/mii-bitbang should be build as module, as well. On other
platforms, mii-fec/mii-bitbang must be included into the main module.
Otherwise some symbols remain undefined. Additionally, fs_enet uses
libphy, so add a select PHYLIB.

  Building modules, stage 2.
  MODPOST 5 modules
ERROR: "fs_scc_ops" [drivers/net/fs_enet/fs_enet.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96a2d41a

drivers/net/fs_enet/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config FS_ENET 
       tristate "Freescale Ethernet Driver"

       depends on CPM1 || CPM2

       select MII

       select PHYLIB



config FS_ENET_HAS_SCC

	bool "Chip has an SCC usable for ethernet"
@@ -11,11 +12,19 @@ config FS_ENET_HAS_SCC 
config FS_ENET_HAS_FCC

	bool "Chip has an FCC usable for ethernet"

	depends on FS_ENET && CPM2

	select MDIO_BITBANG

	default y



config FS_ENET_HAS_FEC

	bool "Chip has an FEC usable for ethernet"

	depends on FS_ENET && CPM1

	select FS_ENET_MDIO_FEC

	default y



config FS_ENET_MDIO_FEC

	tristate "MDIO driver for FEC"

	depends on FS_ENET && CPM1



config FS_ENET_MDIO_FCC

	tristate "MDIO driver for FCC"

	depends on FS_ENET && CPM2

	select MDIO_BITBANG

drivers/net/fs_enet/Makefile

+12 −3
Original line number Diff line number Diff line
@@ -4,7 +4,16 @@ 


obj-$(CONFIG_FS_ENET) += fs_enet.o



obj-$(CONFIG_8xx) += mac-fec.o mac-scc.o mii-fec.o

obj-$(CONFIG_CPM2) += mac-fcc.o mii-bitbang.o

fs_enet-$(CONFIG_FS_ENET_HAS_SCC) += mac-scc.o

fs_enet-$(CONFIG_FS_ENET_HAS_FEC) += mac-fec.o

fs_enet-$(CONFIG_FS_ENET_HAS_FCC) += mac-fcc.o



fs_enet-objs := fs_enet-main.o
 
ifeq ($(CONFIG_PPC_CPM_NEW_BINDING),y)

obj-$(CONFIG_FS_ENET_MDIO_FEC) += mii-fec.o

obj-$(CONFIG_FS_ENET_MDIO_FCC) += mii-bitbang.o

else

fs_enet-$(CONFIG_FS_ENET_MDIO_FEC) += mii-fec.o

fs_enet-$(CONFIG_FS_ENET_MDIO_FCC) += mii-bitbang.o

endif



fs_enet-objs := fs_enet-main.o $(fs_enet-m)