[POWERPC] QE: 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 <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Timur Tabi 2007-03-12 15:40:27 -05:00 committed by Kumar Gala
parent 9eb90a0c3b
commit 7d776cb596
3 changed files with 7 additions and 14 deletions

View File

@ -27,8 +27,6 @@ endchoice
config QUICC_ENGINE config QUICC_ENGINE
bool bool
depends on PPC_MPC836x || PPC_MPC832x
default y
help help
The QUICC Engine (QE) is a new generation of communications The QUICC Engine (QE) is a new generation of communications
coprocessors on Freescale embedded CPUs (akin to CPM in older chips). coprocessors on Freescale embedded CPUs (akin to CPM in older chips).

View File

@ -2,11 +2,8 @@
# QE Communication options # QE Communication options
# #
menu "QE Options"
depends on QUICC_ENGINE
config UCC_SLOW config UCC_SLOW
bool "UCC Slow Protocols Support" bool
default n default n
select UCC select UCC
help help
@ -14,10 +11,9 @@ config UCC_SLOW
protocols: UART, BISYNC, QMC protocols: UART, BISYNC, QMC
config UCC_FAST config UCC_FAST
bool "UCC Fast Protocols Support" bool
default n default n
select UCC select UCC
select UCC_SLOW
help help
This option provides qe_lib support to UCC fast This option provides qe_lib support to UCC fast
protocols: HDLC, Ethernet, ATM, transparent protocols: HDLC, Ethernet, ATM, transparent
@ -26,5 +22,3 @@ config UCC
bool bool
default y if UCC_FAST || UCC_SLOW default y if UCC_FAST || UCC_SLOW
endmenu

View File

@ -2272,11 +2272,12 @@ config GFAR_NAPI
depends on GIANFAR depends on GIANFAR
config UCC_GETH config UCC_GETH
tristate "Freescale QE UCC GETH" tristate "Freescale QE Gigabit Ethernet"
depends on QUICC_ENGINE && UCC_FAST depends on QUICC_ENGINE
select UCC_FAST
help help
This driver supports the Gigabit Ethernet mode of QE UCC. This driver supports the Gigabit Ethernet mode of the QUICC Engine,
QE can be found on MPC836x CPUs. which is available on some Freescale SOCs.
config UGETH_NAPI config UGETH_NAPI
bool "NAPI Support" bool "NAPI Support"