diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 66e67f444bd8..afa30f158308 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -272,7 +272,6 @@ CONFIG_DUMMY=y CONFIG_WIREGUARD=y CONFIG_TUN=y CONFIG_VETH=y -# CONFIG_ETHERNET is not set CONFIG_PHYLIB=y CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 17714f6eb994..f3d55d36b2e8 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -248,7 +248,6 @@ CONFIG_DUMMY=y CONFIG_WIREGUARD=y CONFIG_TUN=y CONFIG_VETH=y -# CONFIG_ETHERNET is not set CONFIG_PHYLIB=y CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y diff --git a/init/Kconfig.gki b/init/Kconfig.gki index a782550d28ca..dea0ceb987dd 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -185,6 +185,15 @@ config GKI_HIDDEN_HYPERVISOR_CONFIGS config, required by various SoC platforms. This is usually selected by XEN or S390. +config GKI_HIDDEN_NET_CONFIGS + bool "Hidden networking configuration needed for GKI" + select PAGE_POOL + select NET_PTP_CLASSIFY + help + Dummy config option used to enable the networking hidden + config, required by various SoC platforms. + + # Atrocities needed for # a) building GKI modules in separate tree, or # b) building drivers that are not modularizable @@ -211,6 +220,7 @@ config GKI_HACKS_TO_FIX select GKI_HIDDEN_GPU_CONFIGS select GKI_HIDDEN_IRQ_CONFIGS select GKI_HIDDEN_HYPERVISOR_CONFIGS + select GKI_HIDDEN_NET_CONFIGS help Dummy config option used to enable core functionality used by modules that may not be selectable in this config.