Skip to content

Commit 53aa6f3

Browse files
committed
Merge branch 'at91-4.19-trunk/wilc-15_2-sama5_defconfig' into at91-4.19-trunk/defconfig
2 parents f18ec8b + a0cf544 commit 53aa6f3

1 file changed

Lines changed: 24 additions & 0 deletions

File tree

arch/arm/configs/sama5_defconfig

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ CONFIG_AEABI=y
3636
CONFIG_CMA=y
3737
CONFIG_CMA_DEBUGFS=y
3838
CONFIG_FORCE_MAX_ZONEORDER=15
39+
CONFIG_PCCARD=y
3940
CONFIG_UACCESS_WITH_MEMCPY=y
4041
# CONFIG_ATAGS is not set
4142
CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -70,9 +71,28 @@ CONFIG_VLAN_8021Q=m
7071
CONFIG_CAN=y
7172
CONFIG_CAN_AT91=y
7273
CONFIG_CAN_M_CAN=y
74+
CONFIG_BT=y
75+
CONFIG_BT_RFCOMM=y
76+
CONFIG_BT_RFCOMM_TTY=y
77+
CONFIG_BT_BNEP=y
78+
CONFIG_BT_BNEP_MC_FILTER=y
79+
CONFIG_BT_BNEP_PROTO_FILTER=y
80+
CONFIG_BT_HIDP=y
81+
CONFIG_BT_HCIBTUSB=y
82+
CONFIG_BT_HCIUART=y
83+
CONFIG_BT_HCIUART_H4=y
84+
CONFIG_BT_HCIUART_3WIRE=y
85+
CONFIG_BT_HCIBTUART=y
86+
CONFIG_BT_HCIVHCI=y
7387
CONFIG_CFG80211=y
88+
# CONFIG_CFG80211_DEFAULT_PS is not set
89+
CONFIG_CFG80211_DEBUGFS=y
90+
CONFIG_CFG80211_WEXT=y
7491
CONFIG_MAC80211=y
7592
CONFIG_MAC80211_LEDS=y
93+
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
94+
CONFIG_RFKILL=y
95+
CONFIG_RFKILL_INPUT=y
7696
# CONFIG_UEVENT_HELPER is not set
7797
CONFIG_DEVTMPFS=y
7898
CONFIG_DEVTMPFS_MOUNT=y
@@ -157,6 +177,8 @@ CONFIG_INPUT_ATMEL_PTC=m
157177
CONFIG_LEGACY_PTY_COUNT=4
158178
CONFIG_SERIAL_ATMEL=y
159179
CONFIG_SERIAL_ATMEL_CONSOLE=y
180+
CONFIG_SERIAL_DEV_BUS=y
181+
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
160182
CONFIG_HW_RANDOM=y
161183
CONFIG_I2C_CHARDEV=y
162184
CONFIG_I2C_AT91=y
@@ -261,6 +283,8 @@ CONFIG_RTC_DRV_AT91RM9200=y
261283
CONFIG_DMADEVICES=y
262284
CONFIG_AT_HDMAC=y
263285
CONFIG_AT_XDMAC=y
286+
CONFIG_STAGING=y
287+
CONFIG_WILC_SDIO=m
264288
# CONFIG_IOMMU_SUPPORT is not set
265289
CONFIG_IIO=y
266290
CONFIG_AT91_ADC=y

0 commit comments

Comments
 (0)