Re: [PATCH] powerpc: Fix fs_enet module build

Previous thread: [PATCH] powerpc: Add support for PORTA and PORTB odr registers by Jochen Friedrich on Tuesday, November 13, 2007 - 2:28 pm. (2 messages)

Next thread: [patch 2/3] Linux Kernel Markers - Document format string by Mathieu Desnoyers on Tuesday, November 13, 2007 - 2:39 pm. (1 message)
To: linuxppc-embedded@ozlabs.org <linuxppc-embedded@...>
Cc: Marcelo Tosatti <marcelo@...>, Scott Wood <scottwood@...>, <linux-kernel@...>, Jeff Garzik <jeff@...>, netdev <netdev@...>, <akpm@...>
Date: Tuesday, November 13, 2007 - 2:32 pm

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: Jochen Friedrich <jochen@scram.de>
---

This patch replaces powerpc-fs_enet-select-phylib-as-the-driver-needs-it.patch
from -mm.

drivers/net/fs_enet/Kconfig | 11 ++++++++++-
drivers/net/fs_enet/Makefile | 15 ++++++++++++---
2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/drivers/net/fs_enet/Kconfig b/drivers/net/fs_enet/Kconfig
index 2765e49..562ea68 100644
--- a/drivers/net/fs_enet/Kconfig
+++ b/drivers/net/fs_enet/Kconfig
@@ -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
diff --git a/drivers/net/fs_enet/Makefile b/drivers/net/fs_enet/Makefile
index 02d4dc1..1ffbe07 100644
--- a/drivers/net/fs_enet/Makefile
+++ b/drivers/net/fs_enet/Makefile
@@ -4,7 +4,16 @@

obj-$(CONFIG_FS_ENET) += fs_enet.o

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

To: <jochen@...>
Cc: <linuxppc-embedded@...>, <marcelo@...>, <scottwood@...>, <linux-kernel@...>, <jeff@...>, <netdev@...>, <akpm@...>
Date: Wednesday, November 14, 2007 - 1:09 am

From: Jochen Friedrich <jochen@scram.de>

This is truly ugly and creates an unnecessarily hard to
maintain and complex driver.

Please find a way to fix this for real, so that the
PPC_CPM_NEW_BINDING ifdef is not necessary at all and
things get built modular or not naturally as we handle
things for other cases like this.

THanks.
-

To: David Miller <davem@...>
Cc: <linuxppc-embedded@...>, <marcelo@...>, <scottwood@...>, <linux-kernel@...>, <jeff@...>, <netdev@...>, <akpm@...>
Date: Wednesday, November 14, 2007 - 7:59 am

I know it's ugly, however, module building is completely
broken right now and I just want to provide a quick and
ugly fix until both that ppc->powerpc transition and the
new binding transition are over. Noone wants to touch the
old stuff any more as it's a pita and it's already scheduled
for removal in a couple of months.

Thanks,
Jochen
-

To: <jochen@...>
Cc: <linuxppc-embedded@...>, <marcelo@...>, <scottwood@...>, <linux-kernel@...>, <jeff@...>, <netdev@...>, <akpm@...>
Date: Wednesday, November 14, 2007 - 7:51 pm

From: Jochen Friedrich <jochen@scram.de>

Fair enough, I'll apply the patch.

Thanks for the explanation.
-

Previous thread: [PATCH] powerpc: Add support for PORTA and PORTB odr registers by Jochen Friedrich on Tuesday, November 13, 2007 - 2:28 pm. (2 messages)

Next thread: [patch 2/3] Linux Kernel Markers - Document format string by Mathieu Desnoyers on Tuesday, November 13, 2007 - 2:39 pm. (1 message)