Skip to contentSkip to conversation

Allow selecting mv643xx_eth on Pegasos again

PATCH In review Gabriel Paubert 2 participants 3 messages May 15, 2009 – May 18, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Allow selecting mv643xx_eth on Pegasos again

Since PPC_MUTIPLATFORM was removed, it was impossible to select the driver for mv643xx_eth on the Pegasos. Fix by allowing to select the driver on CHRP platforms; Pegasos is a CHRP platform and the driver will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.

The patch also removes all references to MV64360 config option which no more exists.

arch/powerpc/Kconfig +1 -1
index a0d1146..1dfeb62 100644
@@ -360,7 +360,7 @@ config PPCBUG_NVRAM
 
 config IRQ_ALL_CPUS
 	bool "Distribute interrupts on all CPUs by default"
-	depends on SMP && !MV64360
+	depends on SMP 
 	help
 	  This option gives the kernel permission to distribute IRQs across
 	  multiple CPUs.  Saying N here will route all IRQs to the first
drivers/net/Kconfig +1 -1
index 214a92d..6fc0ff4 100644
@@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
 	tristate "Marvell Discovery (643XX) and Orion ethernet support"
-	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
+	depends on MV64X60 || PPC_CHRP || PLAT_ORION
 	select INET_LRO
 	select PHYLIB
 	help
#1 lore raw
Quoted 9 lines · Gabriel Paubert

Since PPC_MUTIPLATFORM was removed, it was impossible to select the driver for mv643xx_eth on the Pegasos. Fix by allowing to select the driver on CHRP platforms; Pegasos is a CHRP platform and the driver will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.

The patch also removes all references to MV64360 config option which no more exists.

Please break that up into 2 different patches. The arch/powerpc one that removes the reference from IRQ_ALL_CPUs and the drivers/net/ one which should be set to the netdev mailing list.

Thanks !

Cheers,
Ben.

Quoted 26 lines
arch/powerpc/Kconfig +1 -1
index a0d1146..1dfeb62 100644
@@ -360,7 +360,7 @@ config PPCBUG_NVRAM
 
 config IRQ_ALL_CPUS
 	bool "Distribute interrupts on all CPUs by default"
-	depends on SMP && !MV64360
+	depends on SMP 
 	help
 	  This option gives the kernel permission to distribute IRQs across
 	  multiple CPUs.  Saying N here will route all IRQs to the first
drivers/net/Kconfig +1 -1
index 214a92d..6fc0ff4 100644
@@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
 	tristate "Marvell Discovery (643XX) and Orion ethernet support"
-	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
+	depends on MV64X60 || PPC_CHRP || PLAT_ORION
 	select INET_LRO
 	select PHYLIB
 	help
#2 lore raw
Quoted 6 lines · Benjamin Herrenschmidt
Quoted 5 lines · Gabriel Paubert

Since PPC_MUTIPLATFORM was removed, it was impossible to select the driver for mv643xx_eth on the Pegasos. Fix by allowing to select the driver on CHRP platforms; Pegasos is a CHRP platform and the driver will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.

Quoted 9 lines
Quoted 4 lines

The patch also removes all references to MV64360 config option which no more exists.

Please break that up into 2 different patches. The arch/powerpc one that removes the reference from IRQ_ALL_CPUs and the drivers/net/ one which should be set to the netdev mailing list.

Ok, but I have a doubt about the PPC one, should MV64360 be removed or changed to MV64X60?

In any case, I can't test it.

Gabriel