diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index aa0c2fd89a17..0fa912535754 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -304,7 +304,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 0e1e834af50b..d120cc28478c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -281,7 +281,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 5115d0634aca..54fe05760bea 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -210,6 +210,13 @@ config GKI_HIDDEN_MM_CONFIGS Dummy config option used to enable hidden MM configs, currently required for VIRTIO_BALLOON +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 @@ -239,6 +246,7 @@ config GKI_HACKS_TO_FIX select GKI_HIDDEN_NET_CONFIGS select GKI_HIDDEN_PHY_CONFIGS select GKI_HIDDEN_MM_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.