Skip to content

Commit ce84017

Browse files
committed
Merge tag 'defconfig-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM defconfig updates from Arnd Bergmann: "These are the usual changes to enable newly added driver by default, and to do some housekeeping around changing Kconfig symbols" * tag 'defconfig-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (33 commits) arm64: defconfig: Enable Qualcomm LMH driver arm64: defconfig: Enable Qualcomm prima/pronto drivers arm64: defconfig: Enable Sleep stats driver arm64: defconfig: Visconti: Enable PCIe host controller ARM: configs: aspeed: Remove unused USB gadget devices ARM: config: aspeed: Enable Network Block Device ARM: configs: aspeed: Enable pstore and lockup detectors ARM: configs: aspeed: Enable commonly used drivers ARM: configs: aspeed: Disable IPV6 SIT device ARM: imx_v6_v7_defconfig: Enable HID I2C arm64: defconfig: Enable QTI SC7280 pinctrl, gcc and interconnect arm64: defconfig: Disable firmware sysfs fallback ARM: mvebu_v7_defconfig: rebuild default configuration ARM: mvebu_v7_defconfig: enable mtd physmap arm64: defconfig: Enable few Tegra210 based AHUB drivers arm64: defconfig: drop obsolete ARCH_* configs ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf ARM: imx_v6_v7_defconfig: build imx sdma driver as module ARM: imx_v6_v7_defconfig: rebuild default configuration ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant ...
2 parents d461e96 + fa34893 commit ce84017

File tree

6 files changed

+102
-112
lines changed

6 files changed

+102
-112
lines changed

arch/arm/configs/aspeed_g4_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ CONFIG_INET=y
4848
CONFIG_IP_MULTICAST=y
4949
CONFIG_SYN_COOKIES=y
5050
# CONFIG_INET_DIAG is not set
51+
# CONFIG_IPV6_SIT is not set
5152
CONFIG_NETFILTER=y
5253
# CONFIG_NETFILTER_ADVANCED is not set
5354
CONFIG_VLAN_8021Q=y

arch/arm/configs/aspeed_g5_defconfig

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ CONFIG_SYN_COOKIES=y
6060
CONFIG_IPV6_ROUTER_PREF=y
6161
CONFIG_IPV6_ROUTE_INFO=y
6262
CONFIG_IPV6_OPTIMISTIC_DAD=y
63+
# CONFIG_IPV6_SIT is not set
6364
CONFIG_IPV6_MULTIPLE_TABLES=y
6465
CONFIG_NETFILTER=y
6566
# CONFIG_NETFILTER_ADVANCED is not set
@@ -79,7 +80,9 @@ CONFIG_MTD_UBI=y
7980
CONFIG_MTD_UBI_FASTMAP=y
8081
CONFIG_MTD_UBI_BLOCK=y
8182
CONFIG_BLK_DEV_LOOP=y
83+
CONFIG_BLK_DEV_NBD=y
8284
CONFIG_EEPROM_AT24=y
85+
CONFIG_EEPROM_AT25=y
8386
CONFIG_NETDEVICES=y
8487
CONFIG_NETCONSOLE=y
8588
# CONFIG_NET_VENDOR_ALACRITECH is not set
@@ -140,6 +143,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
140143
CONFIG_SERIAL_8250_DW=y
141144
CONFIG_SERIAL_OF_PLATFORM=y
142145
CONFIG_ASPEED_KCS_IPMI_BMC=y
146+
CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y
143147
CONFIG_IPMI_KCS_BMC_SERIO=y
144148
CONFIG_ASPEED_BT_IPMI_BMC=y
145149
CONFIG_HW_RANDOM_TIMERIOMEM=y
@@ -152,25 +156,33 @@ CONFIG_I2C_ASPEED=y
152156
CONFIG_I2C_FSI=y
153157
CONFIG_I2C_SLAVE=y
154158
CONFIG_SPI=y
159+
CONFIG_SPI_FSI=y
155160
CONFIG_GPIOLIB=y
156161
CONFIG_GPIO_SYSFS=y
157162
CONFIG_GPIO_ASPEED=y
158163
CONFIG_GPIO_ASPEED_SGPIO=y
164+
CONFIG_GPIO_PCA953X=y
165+
CONFIG_GPIO_PCA953X_IRQ=y
159166
CONFIG_W1=y
160167
CONFIG_W1_MASTER_GPIO=y
161168
CONFIG_W1_SLAVE_THERM=y
169+
CONFIG_SENSORS_ADT7475=y
162170
CONFIG_SENSORS_ASPEED=y
163171
CONFIG_SENSORS_IIO_HWMON=y
164172
CONFIG_SENSORS_LM75=y
165173
CONFIG_SENSORS_NCT7904=y
174+
CONFIG_SENSORS_OCC_P9_SBE=y
166175
CONFIG_PMBUS=y
167176
CONFIG_SENSORS_ADM1275=y
168177
CONFIG_SENSORS_IBM_CFFPS=y
169178
CONFIG_SENSORS_IR35221=y
179+
CONFIG_SENSORS_IR38064=y
180+
CONFIG_SENSORS_ISL68137=y
170181
CONFIG_SENSORS_LM25066=y
171182
CONFIG_SENSORS_MAX31785=y
172183
CONFIG_SENSORS_UCD9000=y
173184
CONFIG_SENSORS_UCD9200=y
185+
CONFIG_SENSORS_SBTSI=y
174186
CONFIG_SENSORS_TMP421=y
175187
CONFIG_SENSORS_W83773G=y
176188
CONFIG_WATCHDOG_SYSFS=y
@@ -181,29 +193,18 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
181193
CONFIG_VIDEO_ASPEED=y
182194
CONFIG_DRM=y
183195
CONFIG_DRM_ASPEED_GFX=y
196+
CONFIG_FB=y
184197
CONFIG_USB=y
185198
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
186199
CONFIG_USB_DYNAMIC_MINORS=y
187200
CONFIG_USB_EHCI_HCD=y
188201
CONFIG_USB_EHCI_ROOT_HUB_TT=y
189202
CONFIG_USB_EHCI_HCD_PLATFORM=y
190203
CONFIG_USB_GADGET=y
191-
CONFIG_U_SERIAL_CONSOLE=y
192204
CONFIG_USB_ASPEED_VHUB=y
193205
CONFIG_USB_CONFIGFS=y
194-
CONFIG_USB_CONFIGFS_SERIAL=y
195-
CONFIG_USB_CONFIGFS_ACM=y
196-
CONFIG_USB_CONFIGFS_OBEX=y
197-
CONFIG_USB_CONFIGFS_NCM=y
198-
CONFIG_USB_CONFIGFS_ECM=y
199-
CONFIG_USB_CONFIGFS_ECM_SUBSET=y
200-
CONFIG_USB_CONFIGFS_RNDIS=y
201-
CONFIG_USB_CONFIGFS_EEM=y
202206
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
203-
CONFIG_USB_CONFIGFS_F_LB_SS=y
204-
CONFIG_USB_CONFIGFS_F_FS=y
205207
CONFIG_USB_CONFIGFS_F_HID=y
206-
CONFIG_USB_CONFIGFS_F_PRINTER=y
207208
CONFIG_MMC=y
208209
CONFIG_MMC_SDHCI=y
209210
CONFIG_MMC_SDHCI_PLTFM=y
@@ -230,7 +231,9 @@ CONFIG_RTC_DRV_ASPEED=y
230231
CONFIG_IIO=y
231232
CONFIG_ASPEED_ADC=y
232233
CONFIG_MAX1363=y
234+
CONFIG_SI7020=y
233235
CONFIG_BMP280=y
236+
CONFIG_DPS310=y
234237
CONFIG_RAS=y
235238
CONFIG_FSI=y
236239
CONFIG_FSI_MASTER_GPIO=y
@@ -252,6 +255,11 @@ CONFIG_UBIFS_FS=y
252255
CONFIG_SQUASHFS=y
253256
CONFIG_SQUASHFS_XZ=y
254257
CONFIG_SQUASHFS_ZSTD=y
258+
CONFIG_PSTORE=y
259+
CONFIG_PSTORE_CONSOLE=y
260+
CONFIG_PSTORE_PMSG=y
261+
CONFIG_PSTORE_FTRACE=y
262+
CONFIG_PSTORE_RAM=y
255263
# CONFIG_NETWORK_FILESYSTEMS is not set
256264
CONFIG_HARDENED_USERCOPY=y
257265
CONFIG_FORTIFY_SOURCE=y
@@ -276,7 +284,8 @@ CONFIG_SCHED_STACK_END_CHECK=y
276284
CONFIG_PANIC_ON_OOPS=y
277285
CONFIG_PANIC_TIMEOUT=-1
278286
CONFIG_SOFTLOCKUP_DETECTOR=y
279-
# CONFIG_DETECT_HUNG_TASK is not set
287+
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
288+
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
280289
CONFIG_WQ_WATCHDOG=y
281290
# CONFIG_SCHED_DEBUG is not set
282291
CONFIG_FUNCTION_TRACER=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ CONFIG_KERNEL_LZO=y
22
CONFIG_SYSVIPC=y
33
CONFIG_NO_HZ=y
44
CONFIG_HIGH_RES_TIMERS=y
5+
CONFIG_BPF_SYSCALL=y
56
CONFIG_PREEMPT_VOLUNTARY=y
67
CONFIG_IKCONFIG=y
78
CONFIG_IKCONFIG_PROC=y
89
CONFIG_LOG_BUF_SHIFT=18
910
CONFIG_CGROUPS=y
11+
CONFIG_CGROUP_BPF=y
1012
CONFIG_RELAY=y
1113
CONFIG_BLK_DEV_INITRD=y
1214
CONFIG_EXPERT=y
@@ -28,9 +30,6 @@ CONFIG_SOC_IMX6UL=y
2830
CONFIG_SOC_IMX7D=y
2931
CONFIG_SOC_IMX7ULP=y
3032
CONFIG_SOC_VF610=y
31-
CONFIG_PCI=y
32-
CONFIG_PCI_MSI=y
33-
CONFIG_PCI_IMX6=y
3433
CONFIG_SMP=y
3534
CONFIG_ARM_PSCI=y
3635
CONFIG_HIGHMEM=y
@@ -58,17 +57,13 @@ CONFIG_MODULES=y
5857
CONFIG_MODULE_UNLOAD=y
5958
CONFIG_MODVERSIONS=y
6059
CONFIG_MODULE_SRCVERSION_ALL=y
61-
# CONFIG_BLK_DEV_BSG is not set
6260
CONFIG_BINFMT_MISC=m
6361
CONFIG_NET=y
6462
CONFIG_PACKET=y
6563
CONFIG_UNIX=y
6664
CONFIG_INET=y
6765
CONFIG_IP_PNP=y
6866
CONFIG_IP_PNP_DHCP=y
69-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
70-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
71-
# CONFIG_INET_XFRM_MODE_BEET is not set
7267
CONFIG_NETFILTER=y
7368
CONFIG_CAN=y
7469
CONFIG_CAN_FLEXCAN=y
@@ -81,12 +76,14 @@ CONFIG_CFG80211_WEXT=y
8176
CONFIG_MAC80211=y
8277
CONFIG_RFKILL=y
8378
CONFIG_RFKILL_INPUT=y
79+
CONFIG_PCI=y
80+
CONFIG_PCI_MSI=y
81+
CONFIG_PCI_IMX6=y
8482
CONFIG_DEVTMPFS=y
8583
CONFIG_DEVTMPFS_MOUNT=y
8684
# CONFIG_STANDALONE is not set
8785
CONFIG_FW_LOADER_USER_HELPER=y
8886
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
89-
CONFIG_CMA_SIZE_MBYTES=64
9087
CONFIG_IMX_WEIM=y
9188
CONFIG_CONNECTOR=y
9289
CONFIG_MTD=y
@@ -97,16 +94,15 @@ CONFIG_MTD_JEDECPROBE=y
9794
CONFIG_MTD_CFI_INTELEXT=y
9895
CONFIG_MTD_CFI_AMDSTD=y
9996
CONFIG_MTD_CFI_STAA=y
97+
CONFIG_MTD_PHYSMAP=y
10098
CONFIG_MTD_PHYSMAP_OF=y
10199
CONFIG_MTD_DATAFLASH=y
102-
CONFIG_MTD_M25P80=y
103100
CONFIG_MTD_SST25L=y
104101
CONFIG_MTD_RAW_NAND=y
105102
CONFIG_MTD_NAND_GPMI_NAND=y
106103
CONFIG_MTD_NAND_VF610_NFC=y
107104
CONFIG_MTD_NAND_MXC=y
108105
CONFIG_MTD_SPI_NOR=y
109-
CONFIG_SPI_FSL_QUADSPI=y
110106
CONFIG_MTD_UBI=y
111107
CONFIG_MTD_UBI_FASTMAP=y
112108
CONFIG_MTD_UBI_BLOCK=y
@@ -117,6 +113,7 @@ CONFIG_EEPROM_AT24=y
117113
CONFIG_EEPROM_AT25=y
118114
# CONFIG_SCSI_PROC_FS is not set
119115
CONFIG_BLK_DEV_SD=y
116+
# CONFIG_BLK_DEV_BSG is not set
120117
CONFIG_SCSI_CONSTANTS=y
121118
CONFIG_SCSI_LOGGING=y
122119
CONFIG_SCSI_SCAN_ASYNC=y
@@ -126,7 +123,6 @@ CONFIG_AHCI_IMX=y
126123
CONFIG_PATA_IMX=y
127124
CONFIG_NETDEVICES=y
128125
# CONFIG_NET_VENDOR_BROADCOM is not set
129-
CONFIG_CS89x0=y
130126
CONFIG_CS89x0_PLATFORM=y
131127
# CONFIG_NET_VENDOR_FARADAY is not set
132128
# CONFIG_NET_VENDOR_INTEL is not set
@@ -139,9 +135,8 @@ CONFIG_SMC91X=y
139135
CONFIG_SMC911X=y
140136
CONFIG_SMSC911X=y
141137
# CONFIG_NET_VENDOR_STMICRO is not set
142-
CONFIG_AT803X_PHY=y
143138
CONFIG_MICREL_PHY=y
144-
CONFIG_SMSC_PHY=y
139+
CONFIG_AT803X_PHY=y
145140
CONFIG_USB_PEGASUS=m
146141
CONFIG_USB_RTL8150=m
147142
CONFIG_USB_RTL8152=y
@@ -204,6 +199,7 @@ CONFIG_I2C_ALGOPCA=m
204199
CONFIG_I2C_GPIO=y
205200
CONFIG_I2C_IMX=y
206201
CONFIG_SPI=y
202+
CONFIG_SPI_FSL_QUADSPI=y
207203
CONFIG_SPI_GPIO=y
208204
CONFIG_SPI_IMX=y
209205
CONFIG_SPI_FSL_DSPI=y
@@ -212,14 +208,13 @@ CONFIG_PINCTRL_IMX8MN=y
212208
CONFIG_PINCTRL_IMX8MP=y
213209
CONFIG_PINCTRL_IMX8MQ=y
214210
CONFIG_GPIO_SYSFS=y
211+
CONFIG_GPIO_MXC=y
215212
CONFIG_GPIO_SIOX=m
216213
CONFIG_GPIO_MAX732X=y
217-
CONFIG_GPIO_MC9S08DZ60=y
218214
CONFIG_GPIO_PCA953X=y
219215
CONFIG_GPIO_PCF857X=y
220216
CONFIG_GPIO_STMPE=y
221217
CONFIG_GPIO_74X164=y
222-
CONFIG_GPIO_MXC=y
223218
CONFIG_POWER_RESET=y
224219
CONFIG_POWER_RESET_SYSCON=y
225220
CONFIG_POWER_RESET_SYSCON_POWEROFF=y
@@ -233,8 +228,8 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y
233228
CONFIG_CPU_THERMAL=y
234229
CONFIG_IMX_THERMAL=y
235230
CONFIG_WATCHDOG=y
236-
CONFIG_DA9062_WATCHDOG=y
237231
CONFIG_DA9063_WATCHDOG=m
232+
CONFIG_DA9062_WATCHDOG=y
238233
CONFIG_RN5T618_WATCHDOG=y
239234
CONFIG_IMX2_WDT=y
240235
CONFIG_IMX7ULP_WDT=y
@@ -245,7 +240,6 @@ CONFIG_MFD_MC13XXX_SPI=y
245240
CONFIG_MFD_MC13XXX_I2C=y
246241
CONFIG_MFD_RN5T618=y
247242
CONFIG_MFD_STMPE=y
248-
CONFIG_REGULATOR=y
249243
CONFIG_REGULATOR_FIXED_VOLTAGE=y
250244
CONFIG_REGULATOR_ANATOP=y
251245
CONFIG_REGULATOR_DA9052=y
@@ -261,17 +255,13 @@ CONFIG_RC_CORE=y
261255
CONFIG_RC_DEVICES=y
262256
CONFIG_IR_GPIO_CIR=y
263257
CONFIG_MEDIA_SUPPORT=y
264-
CONFIG_MEDIA_CAMERA_SUPPORT=y
265-
CONFIG_MEDIA_CONTROLLER=y
266-
CONFIG_VIDEO_V4L2_SUBDEV_API=y
267258
CONFIG_MEDIA_USB_SUPPORT=y
268259
CONFIG_USB_VIDEO_CLASS=m
269260
CONFIG_V4L_PLATFORM_DRIVERS=y
270261
CONFIG_VIDEO_MUX=y
271262
CONFIG_V4L_MEM2MEM_DRIVERS=y
272263
CONFIG_VIDEO_CODA=m
273264
CONFIG_VIDEO_IMX_PXP=y
274-
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
275265
CONFIG_VIDEO_ADV7180=m
276266
CONFIG_VIDEO_OV2680=m
277267
CONFIG_VIDEO_OV5640=m
@@ -308,24 +298,23 @@ CONFIG_SND_USB_AUDIO=m
308298
CONFIG_SND_SOC=y
309299
CONFIG_SND_SOC_FSL_ASRC=y
310300
CONFIG_SND_IMX_SOC=y
311-
CONFIG_SND_SOC_PHYCORE_AC97=y
312301
CONFIG_SND_SOC_EUKREA_TLV320=y
313302
CONFIG_SND_SOC_IMX_ES8328=y
314303
CONFIG_SND_SOC_IMX_SGTL5000=y
315304
CONFIG_SND_SOC_IMX_SPDIF=y
316-
CONFIG_SND_SOC_IMX_MC13783=y
317305
CONFIG_SND_SOC_FSL_ASOC_CARD=y
318306
CONFIG_SND_SOC_AC97_CODEC=y
319307
CONFIG_SND_SOC_CS42XX8_I2C=y
320-
CONFIG_SND_SOC_TLV320AIC3X=y
308+
CONFIG_SND_SOC_TLV320AIC3X_I2C=y
321309
CONFIG_SND_SOC_WM8960=y
322310
CONFIG_SND_SOC_WM8962=y
323311
CONFIG_SND_SIMPLE_CARD=y
324312
CONFIG_HID_MULTITOUCH=y
313+
CONFIG_HID_WACOM=y
314+
CONFIG_I2C_HID_OF=y
325315
CONFIG_USB=y
326316
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
327317
CONFIG_USB_EHCI_HCD=y
328-
CONFIG_USB_EHCI_MXC=y
329318
CONFIG_USB_ACM=m
330319
CONFIG_USB_STORAGE=y
331320
CONFIG_USB_CHIPIDEA=y
@@ -340,7 +329,6 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m
340329
CONFIG_NOP_USB_XCEIV=y
341330
CONFIG_USB_MXS_PHY=y
342331
CONFIG_USB_GADGET=y
343-
CONFIG_USB_FSL_USB2=y
344332
CONFIG_USB_CONFIGFS=y
345333
CONFIG_USB_CONFIGFS_SERIAL=y
346334
CONFIG_USB_CONFIGFS_ACM=y
@@ -389,15 +377,15 @@ CONFIG_RTC_DRV_ISL1208=y
389377
CONFIG_RTC_DRV_PCF8523=y
390378
CONFIG_RTC_DRV_PCF8563=y
391379
CONFIG_RTC_DRV_M41T80=y
380+
CONFIG_RTC_DRV_RC5T619=y
392381
CONFIG_RTC_DRV_DA9063=y
393382
CONFIG_RTC_DRV_MC13XXX=y
394383
CONFIG_RTC_DRV_MXC=y
395384
CONFIG_RTC_DRV_MXC_V2=y
396-
CONFIG_RTC_DRV_RC5T619=y
397385
CONFIG_RTC_DRV_SNVS=y
398386
CONFIG_DMADEVICES=y
399387
CONFIG_FSL_EDMA=y
400-
CONFIG_IMX_SDMA=y
388+
CONFIG_IMX_SDMA=m
401389
CONFIG_MXS_DMA=y
402390
CONFIG_DMATEST=m
403391
CONFIG_STAGING=y
@@ -470,13 +458,14 @@ CONFIG_CRC_CCITT=m
470458
CONFIG_CRC_T10DIF=y
471459
CONFIG_CRC7=m
472460
CONFIG_LIBCRC32C=m
461+
CONFIG_CMA_SIZE_MBYTES=64
473462
CONFIG_FONTS=y
474463
CONFIG_FONT_8x8=y
475464
CONFIG_FONT_8x16=y
476465
CONFIG_PRINTK_TIME=y
466+
# CONFIG_DEBUG_BUGVERBOSE is not set
477467
CONFIG_MAGIC_SYSRQ=y
478468
CONFIG_DEBUG_FS=y
479469
# CONFIG_SCHED_DEBUG is not set
480470
CONFIG_PROVE_LOCKING=y
481-
# CONFIG_DEBUG_BUGVERBOSE is not set
482471
# CONFIG_FTRACE is not set

0 commit comments

Comments
 (0)