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

Commit 7d776cb5 authored by Timur Tabi's avatar Timur Tabi Committed by Kumar Gala
Browse files

[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: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 9eb90a0c

arch/powerpc/platforms/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"