ANDROID: GKI: enable networking; add hidden network configs
Drop the explicit disable of CONFIG_ETHERNET from gki_defconfig so wired networking support is enabled by default. Also, when testing GKI with out-of-tree wired networking modules, it was discovered that a few hidden Kconfigs are required. Add them here so out of tree net drivers can be built in a separate tree. Bug: 179406580 Change-Id: Ia66742e514ae1a3c9f8d0ec1d92eb40b68d12ce7 Signed-off-by: Kevin Hilman <khilman@baylibre.com> (cherry picked from commit 30f31797fe80307598bc2502bfe2eb19b9bf13fe kernel/common android-mainline)
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
396d6354ae
commit
2ff6197f94
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user