1 From 9ca67a7287b97dd17216923fae42365488cc49ec Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Tue, 17 Sep 2019 21:23:44 +0200
4 Subject: [PATCH 805/806] configs: Update arm64/bcm2711_defconfig based on the
7 The arm64 and arm configs had diverged in the extra modules that
10 Resync the two for the obvious modules.
12 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
14 arch/arm64/configs/bcm2711_defconfig | 179 ++++++++++++++++++++++++++-
15 1 file changed, 177 insertions(+), 2 deletions(-)
17 --- a/arch/arm64/configs/bcm2711_defconfig
18 +++ b/arch/arm64/configs/bcm2711_defconfig
19 @@ -16,6 +16,7 @@ CONFIG_IKCONFIG=m
20 CONFIG_IKCONFIG_PROC=y
24 CONFIG_CGROUP_FREEZER=y
26 CONFIG_CGROUP_DEVICE=y
27 @@ -93,6 +94,7 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
35 @@ -131,6 +133,36 @@ CONFIG_NF_CONNTRACK_SANE=m
36 CONFIG_NF_CONNTRACK_SIP=m
37 CONFIG_NF_CONNTRACK_TFTP=m
38 CONFIG_NF_CT_NETLINK=m
40 +CONFIG_NF_TABLES_SET=m
41 +CONFIG_NF_TABLES_INET=y
42 +CONFIG_NF_TABLES_NETDEV=y
45 +CONFIG_NFT_FLOW_OFFLOAD=m
47 +CONFIG_NFT_CONNLIMIT=m
60 +CONFIG_NFT_FIB_INET=m
64 +CONFIG_NFT_DUP_NETDEV=m
65 +CONFIG_NFT_FWD_NETDEV=m
66 +CONFIG_NFT_FIB_NETDEV=m
67 +CONFIG_NF_FLOW_TABLE_INET=m
68 +CONFIG_NF_FLOW_TABLE=m
69 CONFIG_NETFILTER_XT_SET=m
70 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
71 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
72 @@ -182,6 +214,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
73 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
74 CONFIG_NETFILTER_XT_MATCH_REALM=m
75 CONFIG_NETFILTER_XT_MATCH_RECENT=m
76 +CONFIG_NETFILTER_XT_MATCH_SOCKET=m
77 CONFIG_NETFILTER_XT_MATCH_STATE=m
78 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
79 CONFIG_NETFILTER_XT_MATCH_STRING=m
80 @@ -218,6 +251,14 @@ CONFIG_IP_VS_SED=m
84 +CONFIG_NFT_CHAIN_ROUTE_IPV4=m
85 +CONFIG_NFT_DUP_IPV4=m
86 +CONFIG_NFT_FIB_IPV4=m
87 +CONFIG_NF_TABLES_ARP=y
88 +CONFIG_NF_FLOW_TABLE_IPV4=m
89 +CONFIG_NFT_CHAIN_NAT_IPV4=m
90 +CONFIG_NFT_MASQ_IPV4=m
91 +CONFIG_NFT_REDIR_IPV4=m
92 CONFIG_IP_NF_IPTABLES=m
93 CONFIG_IP_NF_MATCH_AH=m
94 CONFIG_IP_NF_MATCH_ECN=m
95 @@ -237,6 +278,13 @@ CONFIG_IP_NF_RAW=m
96 CONFIG_IP_NF_ARPTABLES=m
97 CONFIG_IP_NF_ARPFILTER=m
98 CONFIG_IP_NF_ARP_MANGLE=m
99 +CONFIG_NFT_CHAIN_ROUTE_IPV6=m
100 +CONFIG_NFT_CHAIN_NAT_IPV6=m
101 +CONFIG_NFT_MASQ_IPV6=m
102 +CONFIG_NFT_REDIR_IPV6=m
103 +CONFIG_NFT_DUP_IPV6=m
104 +CONFIG_NFT_FIB_IPV6=m
105 +CONFIG_NF_FLOW_TABLE_IPV6=m
106 CONFIG_IP6_NF_IPTABLES=m
107 CONFIG_IP6_NF_MATCH_AH=m
108 CONFIG_IP6_NF_MATCH_EUI64=m
109 @@ -255,6 +303,9 @@ CONFIG_IP6_NF_RAW=m
111 CONFIG_IP6_NF_TARGET_MASQUERADE=m
112 CONFIG_IP6_NF_TARGET_NPT=m
113 +CONFIG_NF_TABLES_BRIDGE=y
114 +CONFIG_NFT_BRIDGE_REJECT=m
115 +CONFIG_NF_LOG_BRIDGE=m
116 CONFIG_BRIDGE_NF_EBTABLES=m
117 CONFIG_BRIDGE_EBT_BROUTE=m
118 CONFIG_BRIDGE_EBT_T_FILTER=m
119 @@ -470,6 +521,7 @@ CONFIG_USB_RTL8150=m
123 +CONFIG_USB_NET_AX8817X=m
124 CONFIG_USB_NET_AX88179_178A=m
125 CONFIG_USB_NET_CDCETHER=m
126 CONFIG_USB_NET_CDC_EEM=m
127 @@ -523,6 +575,8 @@ CONFIG_LIBERTAS_THINFIRM_USB=m
129 CONFIG_MWIFIEX_SDIO=m
136 @@ -563,6 +617,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
137 CONFIG_TOUCHSCREEN_EGALAX=m
138 CONFIG_TOUCHSCREEN_EXC3000=m
139 CONFIG_TOUCHSCREEN_GOODIX=m
140 +CONFIG_TOUCHSCREEN_ILI210X=m
141 CONFIG_TOUCHSCREEN_EDT_FT5X06=m
142 CONFIG_TOUCHSCREEN_RPI_FT5406=m
143 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
144 @@ -586,7 +641,7 @@ CONFIG_GAMEPORT_L4=m
145 CONFIG_BRCM_CHAR_DRIVERS=y
147 CONFIG_BCM2835_DEVGPIOMEM=y
148 -# CONFIG_BCM2835_SMI_DEV is not set
150 # CONFIG_LEGACY_PTYS is not set
152 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
153 @@ -605,10 +660,14 @@ CONFIG_SERIAL_SC16IS7XX_SPI=y
154 CONFIG_SERIAL_DEV_BUS=m
157 -# CONFIG_HW_RANDOM_BCM2835 is not set
160 +CONFIG_TCG_TIS_SPI=m
164 +CONFIG_I2C_MUX_GPMUX=m
165 +CONFIG_I2C_MUX_PCA954x=m
169 @@ -617,6 +676,7 @@ CONFIG_I2C_TINY_USB=m
172 CONFIG_SPI_BCM2835AUX=m
176 CONFIG_PPS_CLIENT_LDISC=m
177 @@ -648,11 +708,15 @@ CONFIG_W1_SLAVE_DS28E04=m
178 CONFIG_W1_SLAVE_DS28E17=m
179 CONFIG_POWER_RESET_GPIO=y
180 CONFIG_BATTERY_DS2760=m
181 +CONFIG_BATTERY_MAX17040=m
182 CONFIG_BATTERY_GAUGE_LTC2941=m
184 CONFIG_SENSORS_DS1621=m
185 +CONFIG_SENSORS_GPIO_FAN=m
186 CONFIG_SENSORS_JC42=m
187 CONFIG_SENSORS_LM75=m
188 +CONFIG_SENSORS_RASPBERRYPI_HWMON=m
189 +CONFIG_SENSORS_RPI_POE_FAN=m
190 CONFIG_SENSORS_SHT21=m
191 CONFIG_SENSORS_SHT3x=m
192 CONFIG_SENSORS_SHTC1=m
193 @@ -660,6 +724,7 @@ CONFIG_SENSORS_ADS1015=m
194 CONFIG_SENSORS_INA2XX=m
195 CONFIG_SENSORS_TMP102=m
197 +CONFIG_BCM2835_THERMAL=y
198 CONFIG_BRCMSTB_THERMAL=y
200 CONFIG_GPIO_WATCHDOG=m
201 @@ -674,6 +739,31 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
202 CONFIG_REGULATOR_ARIZONA_LDO1=m
203 CONFIG_REGULATOR_ARIZONA_MICSUPP=m
204 CONFIG_REGULATOR_GPIO=y
207 +CONFIG_RC_DECODERS=y
208 +CONFIG_IR_NEC_DECODER=m
209 +CONFIG_IR_RC5_DECODER=m
210 +CONFIG_IR_RC6_DECODER=m
211 +CONFIG_IR_JVC_DECODER=m
212 +CONFIG_IR_SONY_DECODER=m
213 +CONFIG_IR_SANYO_DECODER=m
214 +CONFIG_IR_SHARP_DECODER=m
215 +CONFIG_IR_MCE_KBD_DECODER=m
216 +CONFIG_IR_XMP_DECODER=m
217 +CONFIG_IR_IMON_DECODER=m
219 +CONFIG_RC_ATI_REMOTE=m
223 +CONFIG_IR_STREAMZAP=m
226 +CONFIG_RC_LOOPBACK=m
227 +CONFIG_IR_GPIO_CIR=m
230 CONFIG_MEDIA_SUPPORT=m
231 CONFIG_MEDIA_CAMERA_SUPPORT=y
232 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
233 @@ -745,7 +835,40 @@ CONFIG_VIDEO_GO7007=m
234 CONFIG_VIDEO_GO7007_USB=m
235 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
236 CONFIG_VIDEO_AU0828=m
237 +CONFIG_VIDEO_AU0828_RC=y
238 +CONFIG_VIDEO_CX231XX=m
239 +CONFIG_VIDEO_CX231XX_ALSA=m
240 +CONFIG_VIDEO_CX231XX_DVB=m
241 +CONFIG_VIDEO_TM6000=m
242 +CONFIG_VIDEO_TM6000_ALSA=m
243 +CONFIG_VIDEO_TM6000_DVB=m
245 +CONFIG_DVB_USB_A800=m
246 +CONFIG_DVB_USB_DIBUSB_MB=m
247 +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
248 +CONFIG_DVB_USB_DIBUSB_MC=m
249 +CONFIG_DVB_USB_DIB0700=m
250 +CONFIG_DVB_USB_UMT_010=m
251 +CONFIG_DVB_USB_CXUSB=m
252 +CONFIG_DVB_USB_M920X=m
253 +CONFIG_DVB_USB_DIGITV=m
254 +CONFIG_DVB_USB_VP7045=m
255 +CONFIG_DVB_USB_VP702X=m
256 +CONFIG_DVB_USB_GP8PSK=m
257 +CONFIG_DVB_USB_NOVA_T_USB2=m
258 +CONFIG_DVB_USB_TTUSB2=m
259 +CONFIG_DVB_USB_DTT200U=m
260 +CONFIG_DVB_USB_OPERA1=m
261 +CONFIG_DVB_USB_AF9005=m
262 +CONFIG_DVB_USB_AF9005_REMOTE=m
263 +CONFIG_DVB_USB_PCTV452E=m
264 +CONFIG_DVB_USB_DW2102=m
265 +CONFIG_DVB_USB_CINERGY_T2=m
266 +CONFIG_DVB_USB_DTV5100=m
267 +CONFIG_DVB_USB_AZ6027=m
268 +CONFIG_DVB_USB_TECHNISAT_USB2=m
270 +CONFIG_DVB_USB_AF9015=m
271 CONFIG_DVB_USB_AF9035=m
272 CONFIG_DVB_USB_ANYSEE=m
273 CONFIG_DVB_USB_AU6610=m
274 @@ -753,7 +876,9 @@ CONFIG_DVB_USB_AZ6007=m
275 CONFIG_DVB_USB_CE6230=m
276 CONFIG_DVB_USB_EC168=m
277 CONFIG_DVB_USB_GL861=m
278 +CONFIG_DVB_USB_LME2510=m
279 CONFIG_DVB_USB_MXL111SF=m
280 +CONFIG_DVB_USB_RTL28XXU=m
281 CONFIG_DVB_USB_DVBSKY=m
283 CONFIG_DVB_B2C2_FLEXCOP_USB=m
284 @@ -763,6 +888,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m
285 CONFIG_VIDEO_EM28XX_ALSA=m
286 CONFIG_VIDEO_EM28XX_DVB=m
287 CONFIG_V4L_PLATFORM_DRIVERS=y
288 +CONFIG_VIDEO_BCM2835_UNICAM=m
289 CONFIG_RADIO_SI470X=m
292 @@ -782,11 +908,14 @@ CONFIG_RADIO_WL128X=m
293 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
294 CONFIG_VIDEO_UDA1342=m
295 CONFIG_VIDEO_SONY_BTF_MPX=m
296 +CONFIG_VIDEO_ADV7180=m
297 +CONFIG_VIDEO_TC358743=m
298 CONFIG_VIDEO_TVP5150=m
299 CONFIG_VIDEO_TW2804=m
300 CONFIG_VIDEO_TW9903=m
301 CONFIG_VIDEO_TW9906=m
302 CONFIG_VIDEO_IMX219=m
303 +CONFIG_VIDEO_OV5647=m
304 CONFIG_VIDEO_OV7640=m
305 CONFIG_VIDEO_MT9V011=m
307 @@ -797,17 +926,23 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN
311 +CONFIG_TINYDRM_ILI9225=m
312 +CONFIG_TINYDRM_ILI9341=m
313 CONFIG_TINYDRM_MI0283QT=m
314 CONFIG_TINYDRM_REPAPER=m
315 +CONFIG_TINYDRM_ST7586=m
316 +CONFIG_TINYDRM_ST7735R=m
323 # CONFIG_BACKLIGHT_GENERIC is not set
324 CONFIG_BACKLIGHT_RPI=m
325 CONFIG_BACKLIGHT_GPIO=m
326 CONFIG_FRAMEBUFFER_CONSOLE=y
327 +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
329 # CONFIG_LOGO_LINUX_MONO is not set
330 # CONFIG_LOGO_LINUX_VGA16 is not set
331 @@ -834,6 +969,8 @@ CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SO
332 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
333 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
334 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
335 +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
336 +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
337 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
338 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
339 CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m
340 @@ -841,11 +978,14 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m
341 CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
342 CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
343 CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
344 +CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
345 CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
346 CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
347 +CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
348 CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
349 CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
350 CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
351 +CONFIG_SND_AUDIOSENSE_PI=m
352 CONFIG_SND_DIGIDAC1_SOUNDCARD=m
353 CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
354 CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
355 @@ -856,11 +996,14 @@ CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
356 CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
357 CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
359 +CONFIG_SND_SOC_AD193X_SPI=m
360 +CONFIG_SND_SOC_AD193X_I2C=m
361 CONFIG_SND_SOC_ADAU1701=m
362 CONFIG_SND_SOC_ADAU7002=m
363 CONFIG_SND_SOC_AK4554=m
364 CONFIG_SND_SOC_CS4265=m
365 CONFIG_SND_SOC_CS4271_I2C=m
366 +CONFIG_SND_SOC_ICS43432=m
367 CONFIG_SND_SOC_SPDIF=m
368 CONFIG_SND_SOC_WM8804_I2C=m
369 CONFIG_SND_SIMPLE_CARD=m
370 @@ -873,6 +1016,7 @@ CONFIG_HID_APPLE=m
373 CONFIG_HID_BETOP_FF=m
374 +CONFIG_HID_BIGBEN_FF=m
378 @@ -1022,6 +1166,24 @@ CONFIG_USB_CXACRU=m
379 CONFIG_USB_UEAGLEATM=m
382 +CONFIG_USB_CONFIGFS=m
383 +CONFIG_USB_CONFIGFS_SERIAL=y
384 +CONFIG_USB_CONFIGFS_ACM=y
385 +CONFIG_USB_CONFIGFS_OBEX=y
386 +CONFIG_USB_CONFIGFS_NCM=y
387 +CONFIG_USB_CONFIGFS_ECM=y
388 +CONFIG_USB_CONFIGFS_ECM_SUBSET=y
389 +CONFIG_USB_CONFIGFS_RNDIS=y
390 +CONFIG_USB_CONFIGFS_EEM=y
391 +CONFIG_USB_CONFIGFS_MASS_STORAGE=y
392 +CONFIG_USB_CONFIGFS_F_LB_SS=y
393 +CONFIG_USB_CONFIGFS_F_FS=y
394 +CONFIG_USB_CONFIGFS_F_UAC1=y
395 +CONFIG_USB_CONFIGFS_F_UAC2=y
396 +CONFIG_USB_CONFIGFS_F_MIDI=y
397 +CONFIG_USB_CONFIGFS_F_HID=y
398 +CONFIG_USB_CONFIGFS_F_UVC=y
399 +CONFIG_USB_CONFIGFS_F_PRINTER=y
403 @@ -1048,6 +1210,8 @@ CONFIG_LEDS_CLASS=y
404 CONFIG_LEDS_PCA9532=m
406 CONFIG_LEDS_PCA955X=m
407 +CONFIG_LEDS_PCA963X=m
408 +CONFIG_LEDS_IS31FL32XX=m
409 CONFIG_LEDS_TRIGGER_TIMER=y
410 CONFIG_LEDS_TRIGGER_ONESHOT=y
411 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
412 @@ -1059,6 +1223,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m
413 CONFIG_LEDS_TRIGGER_CAMERA=m
414 CONFIG_LEDS_TRIGGER_INPUT=y
415 CONFIG_LEDS_TRIGGER_PANIC=y
416 +CONFIG_LEDS_TRIGGER_NETDEV=m
418 # CONFIG_RTC_HCTOSYS is not set
419 CONFIG_RTC_DRV_ABX80X=m
420 @@ -1080,6 +1245,7 @@ CONFIG_RTC_DRV_FM3130=m
421 CONFIG_RTC_DRV_RX8581=m
422 CONFIG_RTC_DRV_RX8025=m
423 CONFIG_RTC_DRV_EM3027=m
424 +CONFIG_RTC_DRV_RV3028=m
425 CONFIG_RTC_DRV_M41T93=m
426 CONFIG_RTC_DRV_M41T94=m
427 CONFIG_RTC_DRV_DS1302=m
428 @@ -1096,6 +1262,8 @@ CONFIG_RTC_DRV_RV3029C2=m
435 CONFIG_UIO_PDRV_GENIRQ=m
437 @@ -1124,6 +1292,7 @@ CONFIG_FB_TFT_PCD8544=m
438 CONFIG_FB_TFT_RA8875=m
439 CONFIG_FB_TFT_S6D02A1=m
440 CONFIG_FB_TFT_S6D1121=m
441 +CONFIG_FB_TFT_SH1106=m
442 CONFIG_FB_TFT_SSD1289=m
443 CONFIG_FB_TFT_SSD1306=m
444 CONFIG_FB_TFT_SSD1331=m
445 @@ -1137,8 +1306,10 @@ CONFIG_FB_TFT_UPD161704=m
446 CONFIG_FB_TFT_WATTEROTT=m
448 CONFIG_FB_TFT_FBTFT_DEVICE=m
449 +CONFIG_BCM2835_VCHIQ=y
451 CONFIG_VIDEO_BCM2835=m
452 +CONFIG_VIDEO_CODEC_BCM2835=m
454 CONFIG_BCM2835_MBOX=y
455 # CONFIG_IOMMU_SUPPORT is not set
456 @@ -1150,9 +1321,11 @@ CONFIG_IIO=m
457 CONFIG_IIO_BUFFER_CB=m
464 +CONFIG_INV_MPU6050_I2C=m
468 @@ -1283,6 +1456,7 @@ CONFIG_CRYPTO_CAST5=m
471 CONFIG_CRYPTO_USER_API_SKCIPHER=m
472 +# CONFIG_CRYPTO_HW is not set
476 @@ -1294,6 +1468,7 @@ CONFIG_IRQSOFF_TRACER=y
477 CONFIG_SCHED_TRACER=y
478 CONFIG_STACK_TRACER=y
479 CONFIG_BLK_DEV_IO_TRACE=y
480 +# CONFIG_UPROBE_EVENTS is not set
481 CONFIG_FUNCTION_PROFILER=y