From b40067c6009a1be77269202dc21448ad318ce1fd Mon Sep 17 00:00:00 2001 From: "Ghosh, Purnendu" <purnendu.ghosh@intel.com> Date: Fri, 22 Dec 2017 15:08:51 +0100 Subject: [PATCH] Merge pull request #196 in SW_PON/linux from feature/UGW_SW-20487-porting-dc_dp-to-4.9-kernel to xrx500 * commit '95212fc8c2ca3d7348d82aa8ca1f6397d1dcb19e': UGW_SW-20487: Removed DIRECTCONNECT_DP_DBGfrom directconnect_dp Kconfig UGW_SW-20487: Removed sourcing of directconnect_dp Kconfig UGW_SW-20487: Reverting Kconfig changes to TopLevel done by Mistake --- Kconfig | 7 ------- drivers/net/ethernet/lantiq/Kconfig | 1 - .../ethernet/lantiq/directconnect_dp/Kconfig | 21 ++++++------------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/Kconfig b/Kconfig index 146d0fd81..c13f48d65 100644 --- a/Kconfig +++ b/Kconfig @@ -9,10 +9,3 @@ config SRCARCH option env="SRCARCH" source "arch/$SRCARCH/Kconfig" - -config DIRECTCONNECT_DP_API - tristate "DirectConnect Datapath API framework" - default n - depends on SOC_XWAY || SOC_GRX500 - ---help--- - DirectConnect Datapath API framework support for Intel/Lantiq SoCs. diff --git a/drivers/net/ethernet/lantiq/Kconfig b/drivers/net/ethernet/lantiq/Kconfig index ae952b323..44a665b6d 100644 --- a/drivers/net/ethernet/lantiq/Kconfig +++ b/drivers/net/ethernet/lantiq/Kconfig @@ -88,5 +88,4 @@ source "drivers/net/ethernet/lantiq/cqm/Kconfig" source "drivers/net/ethernet/lantiq/tmu/Kconfig" source "drivers/net/ethernet/lantiq/ppv4/Kconfig" source "drivers/net/ethernet/lantiq/ppa/Kconfig" -source "drivers/net/ethernet/lantiq/directconnect_dp/Kconfig" endif # NET_VENDOR_LANTIQ diff --git a/drivers/net/ethernet/lantiq/directconnect_dp/Kconfig b/drivers/net/ethernet/lantiq/directconnect_dp/Kconfig index b4eb0f78a..af0f938a4 100644 --- a/drivers/net/ethernet/lantiq/directconnect_dp/Kconfig +++ b/drivers/net/ethernet/lantiq/directconnect_dp/Kconfig @@ -1,19 +1,10 @@ # # DirectConnect Datapath Driver # -config DIRECTCONNECT_DP - tristate "Lantiq DirectConnect Datapath driver for XRX500 series" - default n - #depends on SOC_GRX500 - ---help--- - Lantiq DirectConnect Datapath driver for XRX500 series. +config DIRECTCONNECT_DP_API + tristate "DirectConnect Datapath API framework" + default n + depends on SOC_XWAY || SOC_GRX500 + ---help--- + DirectConnect Datapath API framework support for Intel/Lantiq SoCs. -config DIRECTCONNECT_DP_DBG - bool "Datapath Debug Tool" - default y - depends on DIRECTCONNECT_DP - ---help--- - Directconnect Datapath Debug Tool is used to provide simple debug proc tool - Each flag can be enabled/disabled easily - Once this flag is enabled, the debugging information will be printed out - otherwise, no debugging information for this flag will be printed -- GitLab