diff options
| author | Olof Johansson <olof@lixom.net> | 2020-10-03 13:15:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-10-03 13:15:22 -0700 |
| commit | e3a2e20297fcea9b5f35f8bd88125afb2ba3b806 (patch) | |
| tree | 4ca1fe0c8084272cb69f53b07dff6ea606a5567f /arch/arm | |
| parent | b402b4e67c1bed5184138b453a84dcc6fea01a1d (diff) | |
| parent | 74623757b98239b1eb43304e1f5d15a29b40fb84 (diff) | |
| download | linux-e3a2e20297fcea9b5f35f8bd88125afb2ba3b806.tar.bz2 | |
Merge tag 'omap-for-v5.10/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/defconfig
Defconfig changes for omaps for v5.10 merge window
Enable twl4030_madc as a loadable module as the ADC is used
on some devices by the battery charger. And enable more widely
used networking options as loadable modules where possible.
* tag 'omap-for-v5.10/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: enable generic net options
ARM: omap2plus_defconfig: enable twl4030_madc as a loadable module
Link: https://lore.kernel.org/r/pull-1601445968-476435@atomide.com-3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index fe383f5a92fb..34793aabdb65 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -95,7 +95,18 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y CONFIG_NETFILTER=y +CONFIG_BRIDGE=m +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_VLAN_8021Q=m CONFIG_PHONET=m +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_CLS_U32=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_MATCHALL=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m CONFIG_NET_SWITCHDEV=y CONFIG_CAN=m CONFIG_CAN_C_CAN=m @@ -510,6 +521,7 @@ CONFIG_IIO_ST_ACCEL_3AXIS=m CONFIG_CPCAP_ADC=m CONFIG_INA2XX_ADC=m CONFIG_TI_AM335X_ADC=m +CONFIG_TWL4030_MADC=m CONFIG_SENSORS_ISL29028=m CONFIG_BMP280=m CONFIG_PWM=y |