From 79f44ef795b53207d9b368728a66c45259bb159a Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Tue, 8 Jun 2021 22:53:40 +0900 Subject: [PATCH] ANDROID: GKI: Kconfig.gki: Add GKI_HIDDEN_ETHERNET_CONFIGS Add a hidden config option to select PHYLINK which is widely used by ethernet devices. This also removes PHYLIB=y from gki_defconfig because it is selected by CONFIG_PHYLINK. Bug: 190472243 Signed-off-by: Chanho Park Change-Id: I590f7576daddab6786d19ffc789e51816770e5e3 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - init/Kconfig.gki | 8 ++++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 69a9e94cf848..5cc540459747 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -314,7 +314,6 @@ CONFIG_WIREGUARD=y CONFIG_IFB=y CONFIG_TUN=y CONFIG_VETH=y -CONFIG_PHYLIB=y CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 273ce86af4c0..86d593abaf29 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -287,7 +287,6 @@ CONFIG_WIREGUARD=y CONFIG_IFB=y CONFIG_TUN=y CONFIG_VETH=y -CONFIG_PHYLIB=y CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y diff --git a/init/Kconfig.gki b/init/Kconfig.gki index b07db9ed4bdb..1a4fde6a8e62 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -219,6 +219,13 @@ config GKI_HIDDEN_DMA_CONFIGS Dummy config option used to enable the hidden DMA configs, required by various SoC platforms. +config GKI_HIDDEN_ETHERNET_CONFIGS + bool "Hidden Ethernet configuration needed for GKI" + select PHYLINK + help + Dummy config option used to enable the hidden Ethernet PHYLINK + configs, required by various ethernet devices. + # Atrocities needed for # a) building GKI modules in separate tree, or # b) building drivers that are not modularizable @@ -249,6 +256,7 @@ config GKI_HACKS_TO_FIX select GKI_HIDDEN_PHY_CONFIGS select GKI_HIDDEN_MM_CONFIGS select GKI_HIDDEN_DMA_CONFIGS + select GKI_HIDDEN_ETHERNET_CONFIGS help Dummy config option used to enable core functionality used by modules that may not be selectable in this config.