diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2026-08-04 21:37:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2026-08-04 21:37:11 +0200 |
| commit | 7cced70f523e629a5d792f580b77f4a7c2ffabd3 (patch) | |
| tree | 7ce23e6fb1b9d9c9d338aa1da66ae6ba1a20eb37 /arch/arm | |
| parent | dab25da95ac972c84da2f04f2b412c9a5d0165e9 (diff) | |
| parent | d091917c23668cebb0ad23b18f5a9f6665150054 (diff) | |
| download | linux-next-7cced70f523e629a5d792f580b77f4a7c2ffabd3.tar.gz linux-next-7cced70f523e629a5d792f580b77f4a7c2ffabd3.zip | |
Merge tag 'omap-for-v7.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/defconfig
arm/omap: defconfig updates for v7.3
- omap2plus_defconfig: Enable multi-LED
- omap2plus_defconfig: enable things required by iwd
- multi_v7_defconfig: Enable BRIDGE and DP83848_PHY for TI AM57xx, AM437x and AM335x
* tag 'omap-for-v7.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
arm: omap2plus_defconfig: Enable multi-LED
ARM: omap2plus_defconfig: enable things required by iwd
arm: multi_v7_defconfig: Enable BRIDGE and DP83848_PHY for TI AM57xx, AM437x and AM335x
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 2de547c8b901..6131cec01b0c 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -149,6 +149,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_BRIDGE=m CONFIG_NET_DSA=m CONFIG_QRTR=m CONFIG_QRTR_SMD=m @@ -288,6 +289,7 @@ CONFIG_ICPLUS_PHY=y CONFIG_MARVELL_PHY=y CONFIG_AT803X_PHY=y CONFIG_ROCKCHIP_PHY=y +CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=y CONFIG_CAN_AT91=m CONFIG_CAN_FLEXCAN=m diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index ad5ae1636dee..f827f89567fd 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -257,6 +257,9 @@ CONFIG_RXKAD=y CONFIG_CFG80211=m CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_GPIO=m CONFIG_PCI=y CONFIG_PCI_MSI=y CONFIG_PCI_DRA7XX_EP=y @@ -602,6 +605,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MMC_SDHCI_OMAP=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS_MULTICOLOR=m CONFIG_LEDS_CPCAP=m CONFIG_LEDS_LM3532=m CONFIG_LEDS_GPIO=m @@ -611,6 +615,7 @@ CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PWM=m CONFIG_LEDS_BD2606MVV=m CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_GROUP_MULTICOLOR=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m @@ -703,7 +708,15 @@ CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y +CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY=y +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_ZSTD=y +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_GHASH_ARM_CE=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_ARM_BS=m |