Skip to content

Commit b5d1963

Browse files
committed
Merge branch 'at91-4.14-trunk/defconfig' into linux-4.14-at91
2 parents cf5e91b + d612806 commit b5d1963

1 file changed

Lines changed: 8 additions & 15 deletions

File tree

arch/arm/configs/sama5_defconfig

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# CONFIG_SWAP is not set
22
CONFIG_SYSVIPC=y
3-
CONFIG_FHANDLE=y
43
CONFIG_POSIX_MQUEUE=y
54
CONFIG_IRQ_DOMAIN_DEBUG=y
65
CONFIG_NO_HZ_IDLE=y
@@ -32,7 +31,6 @@ CONFIG_ARCH_AT91=y
3231
CONFIG_SOC_SAMA5D2=y
3332
CONFIG_SOC_SAMA5D3=y
3433
CONFIG_SOC_SAMA5D4=y
35-
CONFIG_AEABI=y
3634
CONFIG_CMA=y
3735
CONFIG_CMA_DEBUGFS=y
3836
CONFIG_FORCE_MAX_ZONEORDER=15
@@ -118,32 +116,31 @@ CONFIG_MACB=y
118116
# CONFIG_NET_VENDOR_SEEQ is not set
119117
# CONFIG_NET_VENDOR_SMSC is not set
120118
# CONFIG_NET_VENDOR_STMICRO is not set
121-
# CONFIG_NET_VENDOR_SYNOPSYS is not set
122119
# CONFIG_NET_VENDOR_VIA is not set
123120
# CONFIG_NET_VENDOR_WIZNET is not set
121+
# CONFIG_NET_VENDOR_SYNOPSYS is not set
124122
CONFIG_MICREL_PHY=y
125123
CONFIG_LIBERTAS_THINFIRM=m
126124
CONFIG_LIBERTAS_THINFIRM_USB=m
127-
CONFIG_RTL8187=m
125+
CONFIG_MWIFIEX=m
126+
CONFIG_MWIFIEX_SDIO=m
127+
CONFIG_MWIFIEX_USB=m
128128
CONFIG_RT2X00=m
129129
CONFIG_RT2500USB=m
130130
CONFIG_RT73USB=m
131131
CONFIG_RT2800USB=m
132132
CONFIG_RT2800USB_RT53XX=y
133133
CONFIG_RT2800USB_RT55XX=y
134134
CONFIG_RT2800USB_UNKNOWN=y
135-
CONFIG_MWIFIEX=m
136-
CONFIG_MWIFIEX_SDIO=m
137-
CONFIG_MWIFIEX_USB=m
138-
# CONFIG_INPUT_MOUSEDEV is not set
135+
CONFIG_RTL8187=m
139136
CONFIG_INPUT_EVDEV=y
140137
# CONFIG_KEYBOARD_ATKBD is not set
141138
CONFIG_KEYBOARD_QT1070=y
142139
CONFIG_KEYBOARD_GPIO=y
143140
# CONFIG_INPUT_MOUSE is not set
144141
CONFIG_INPUT_TOUCHSCREEN=y
145-
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
146142
CONFIG_TOUCHSCREEN_ADC=y
143+
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
147144
CONFIG_INPUT_MISC=y
148145
CONFIG_INPUT_ATMEL_PTC=m
149146
# CONFIG_SERIO is not set
@@ -159,9 +156,9 @@ CONFIG_SPI_ATMEL=y
159156
CONFIG_SPI_GPIO=y
160157
CONFIG_SPI_SPIDEV=m
161158
CONFIG_GPIO_SYSFS=y
159+
CONFIG_POWER_RESET=y
162160
CONFIG_POWER_SUPPLY=y
163161
CONFIG_BATTERY_ACT8945A=y
164-
CONFIG_POWER_RESET=y
165162
# CONFIG_HWMON is not set
166163
CONFIG_WATCHDOG=y
167164
CONFIG_AT91SAM9X_WATCHDOG=y
@@ -174,6 +171,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
174171
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
175172
CONFIG_REGULATOR_ACT8865=y
176173
CONFIG_REGULATOR_ACT8945A=y
174+
# CONFIG_RC_CORE is not set
177175
CONFIG_MEDIA_SUPPORT=y
178176
CONFIG_MEDIA_CAMERA_SUPPORT=y
179177
CONFIG_MEDIA_CONTROLLER=y
@@ -191,9 +189,6 @@ CONFIG_VIDEO_OV7640=m
191189
CONFIG_VIDEO_OV7670=m
192190
CONFIG_VIDEO_OV7740=m
193191
CONFIG_VIDEO_OV9650=m
194-
# CONFIG_DVB_AU8522_V4L is not set
195-
# CONFIG_DVB_TUNER_DIB0070 is not set
196-
# CONFIG_DVB_TUNER_DIB0090 is not set
197192
CONFIG_DRM=y
198193
CONFIG_DRM_ATMEL_HLCDC=y
199194
CONFIG_DRM_PANEL_SIMPLE=y
@@ -231,7 +226,6 @@ CONFIG_USB_ZERO=m
231226
CONFIG_USB_MASS_STORAGE=m
232227
CONFIG_USB_G_SERIAL=m
233228
CONFIG_MMC=y
234-
# CONFIG_MMC_BLOCK_BOUNCE is not set
235229
CONFIG_MMC_SDHCI=y
236230
CONFIG_MMC_SDHCI_PLTFM=y
237231
CONFIG_MMC_SDHCI_OF_AT91=y
@@ -242,7 +236,6 @@ CONFIG_LEDS_GPIO=y
242236
CONFIG_LEDS_PWM=y
243237
CONFIG_LEDS_REGULATOR=m
244238
CONFIG_LEDS_BLINKM=m
245-
CONFIG_LEDS_TRIGGERS=y
246239
CONFIG_LEDS_TRIGGER_TIMER=y
247240
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
248241
CONFIG_LEDS_TRIGGER_CPU=y

0 commit comments

Comments
 (0)