Skip to contentSkip to conversation

powerpc: automatically select QE options

PATCH Applied Timur Tabi 4 participants 6 messages Mar 12, 2007 – May 29, 2007

Subsystems (2)
Network drivers PowerPC
lore
Share & tools
lore

Timur Tabi

author
#0 lore raw

PATCH 1/1 powerpc: automatically select QE options

Change the Kconfig files so that the Freescale QE options are automatically selected if a QE device is selected. Previously, you'd need to manually select UCC_FAST if you want any "fast" UCC devices, such as Gigabit Ethernet. Now, the QE Gigabit Ethernet option is always available if the device has a QE, and UCC_FAST is automatically enabled. A side-effect is that the "QE Options" menu no longer exists.

Signed-off-by Timur Tabi <[email protected]>
---
 arch/powerpc/Kconfig               |    2 --
 arch/powerpc/sysdev/qe_lib/Kconfig |   10 ++--------
 drivers/net/Kconfig                |    9 +++++----
 3 files changed, 7 insertions(+), 14 deletions(-)
arch/powerpc/Kconfig +0 -2
index 6dfbd52..54dd66c 100644
@@ -396,8 +396,6 @@ endchoice
 
 config QUICC_ENGINE
 	bool
-	depends on PPC_MPC836x || PPC_MPC832x
-	default y
 	help
 	  The QUICC Engine (QE) is a new generation of communications
 	  coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
arch/powerpc/sysdev/qe_lib/Kconfig +2 -8
index a725e80..887739f 100644
@@ -2,11 +2,8 @@
 # QE Communication options
 #
 
-menu "QE Options"
-	depends on QUICC_ENGINE
-
 config UCC_SLOW
-	bool "UCC Slow Protocols Support"
+	bool
 	default n
 	select UCC
 	help

@@ -14,10 +11,9 @@ config UCC_SLOW
 	  protocols: UART, BISYNC, QMC
 
 config UCC_FAST
-	bool "UCC Fast Protocols Support"
+	bool
 	default n
 	select UCC
-	select UCC_SLOW
 	help
 	  This option provides qe_lib support to UCC fast
 	  protocols: HDLC, Ethernet, ATM, transparent

@@ -26,5 +22,3 @@ config UCC
 	bool
 	default y if UCC_FAST || UCC_SLOW
 
-endmenu
-
drivers/net/Kconfig +5 -4
index d9400ef..b92a4e6 100644
@@ -2272,11 +2272,12 @@ config GFAR_NAPI
 	depends on GIANFAR
 
 config UCC_GETH
-	tristate "Freescale QE UCC GETH"
-	depends on QUICC_ENGINE && UCC_FAST
+	tristate "Freescale QE Gigabit Ethernet"
+	depends on QUICC_ENGINE
+	select UCC_FAST
 	help
-	  This driver supports the Gigabit Ethernet mode of QE UCC.
-	  QE can be found on MPC836x CPUs.
+	  This driver supports the Gigabit Ethernet mode of the QUICC Engine,
+	  which is available on some Freescale SOCs.
 
 config UGETH_NAPI
 	bool "NAPI Support"
Signature · 1 line
1.5.0.2.260.g2eb065
#1 lore raw

Timur,

ACK on removing choices for UCC_FAST and UCC_SLOW. =20

arch/powerpc/Kconfig endchoice

Quoted 13 lines
arch/powerpc/Kconfig +0 -0
index 6dfbd52..54dd66c 100644
@@ -396,8 +396,6 @@ endchoice

=20
config QUICC_ENGINE

arch/powerpc/Kconfig +0 -2
 	bool
-	depends on PPC_MPC836x || PPC_MPC832x
-	default y
 	help
 	  The QUICC Engine (QE) is a new generation of communications
 	  coprocessors on Freescale embedded CPUs (akin to CPM in older

chips).

But I'd prefer QUICC_ENGINE option to depend on chip models rather than boards. Also the comment doesn't reflect this change.

[snip]

- Leo

#2 lore raw
Quoted 19 lines · On Mar 13, 2007, at 5:24 AM, Li Yang-r58472 wrote:

Timur,

ACK on removing choices for UCC_FAST and UCC_SLOW.

arch/powerpc/Kconfig endchoice · line 401

Quoted 13 lines
arch/powerpc/Kconfig +0 -2
index 6dfbd52..54dd66c 100644
@@ -396,8 +396,6 @@ endchoice
 
 config QUICC_ENGINE
 	bool
-	depends on PPC_MPC836x || PPC_MPC832x
-	default y
 	help
 	  The QUICC Engine (QE) is a new generation of communications
 	  coprocessors on Freescale embedded CPUs (akin to CPM in older

chips).

Quoted 2 lines

But I'd prefer QUICC_ENGINE option to depend on chip models rather than boards. Also the comment doesn't reflect this change.

We are going to make QUICC_ENGINE a selectable option like it is for CPM2. I agree that selectable option should depend on chip rather than board.

- k

Applied
#3 lore raw
In reply to Timur Tabi
Quoted 8 lines · Timur Tabi

Change the Kconfig files so that the Freescale QE options are automatically selected if a QE device is selected. Previously, you'd need to manually select UCC_FAST if you want any "fast" UCC devices, such as Gigabit Ethernet. Now, the QE Gigabit Ethernet option is always available if the device has a QE, and UCC_FAST is automatically enabled. A side-effect is that the "QE Options" menu no longer exists.

Signed-off-by Timur Tabi <[email protected]>

applied.

- k

#4 lore raw
In reply to Timur Tabi

Hello.

Quoted 12 lines · Timur Tabi

Change the Kconfig files so that the Freescale QE options are automatically selected if a QE device is selected. Previously, you'd need to manually select UCC_FAST if you want any "fast" UCC devices, such as Gigabit Ethernet. Now, the QE Gigabit Ethernet option is always available if the device has a QE, and UCC_FAST is automatically enabled. A side-effect is that the "QE Options" menu no longer exists.

drivers/net/Kconfig +0 -0
index d9400ef..b92a4e6 100644

drivers/net/Kconfig config GFAR_NAPI · line 2277

Quoted 8 lines
drivers/net/Kconfig +3 -2
@@ -2272,11 +2272,12 @@ config GFAR_NAPI
 	depends on GIANFAR
 
 config UCC_GETH
-	tristate "Freescale QE UCC GETH"
-	depends on QUICC_ENGINE && UCC_FAST
+	tristate "Freescale QE Gigabit Ethernet"
+	depends on QUICC_ENGINE
+	select UCC_FAST

Grr... this causes menuconfig to complain on non-PPC archs:

drivers/net/Kconfig:2278:warning: 'select' used by config symbol 'UCC_GETH' refer to undefined symbol 'UCC_FAST'

WBR, Sergei

author
#5 lore raw
Quoted 3 lines · Sergei Shtylyov

Grr... this causes menuconfig to complain on non-PPC archs:

drivers/net/Kconfig:2278:warning: 'select' used by config symbol 'UCC_GETH' refer to undefined symbol 'UCC_FAST'

I submitted a fix for this a LONG time ago. It was applied to the -mm tree and to Kumar's tree, so I don't know why you don't have it.