Skip to content

Commit e2f42a9

Browse files
ziswilerShawn Guo
authored andcommitted
ARM: imx_v6_v7_defconfig: rebuild default configuration
Run "make imx_v6_v7_defconfig; make savedefconfig" to rebuild imx_v6_v7_defconfig. This dropped the following nowadays obsolete configuration options: CONFIG_MTD_M25P80=y (got integrated into MTD_SPI_NOR) CONFIG_CS89x0=y (selected by CS89x0_PLATFORM) CONFIG_SMSC_PHY=y (selected by USB_NET_SMSC95XX) CONFIG_GPIO_MC9S08DZ60=y (depends on MACH_MX35_3DS) CONFIG_REGULATOR=y (selected by various stuff) CONFIG_MEDIA_CAMERA_SUPPORT=y (defaults to on if MEDIA_CAMERA) CONFIG_MEDIA_CONTROLLER=y (selected by various stuff) CONFIG_VIDEO_V4L2_SUBDEV_API=y (selected by various stuff) CONFIG_SND_SOC_PHYCORE_AC97=y CONFIG_SND_SOC_IMX_MC13783=y CONFIG_USB_EHCI_MXC=y CONFIG_USB_FSL_USB2=y Signed-off-by: Marcel Ziswiler <[email protected]> Reviewed-by: Fabio Estevam <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent 9358356 commit e2f42a9

File tree

1 file changed

+11
-27
lines changed

1 file changed

+11
-27
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ CONFIG_SOC_IMX6UL=y
2828
CONFIG_SOC_IMX7D=y
2929
CONFIG_SOC_IMX7ULP=y
3030
CONFIG_SOC_VF610=y
31-
CONFIG_PCI=y
32-
CONFIG_PCI_MSI=y
33-
CONFIG_PCI_IMX6=y
3431
CONFIG_SMP=y
3532
CONFIG_ARM_PSCI=y
3633
CONFIG_HIGHMEM=y
@@ -58,17 +55,13 @@ CONFIG_MODULES=y
5855
CONFIG_MODULE_UNLOAD=y
5956
CONFIG_MODVERSIONS=y
6057
CONFIG_MODULE_SRCVERSION_ALL=y
61-
# CONFIG_BLK_DEV_BSG is not set
6258
CONFIG_BINFMT_MISC=m
6359
CONFIG_NET=y
6460
CONFIG_PACKET=y
6561
CONFIG_UNIX=y
6662
CONFIG_INET=y
6763
CONFIG_IP_PNP=y
6864
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
7265
CONFIG_NETFILTER=y
7366
CONFIG_CAN=y
7467
CONFIG_CAN_FLEXCAN=y
@@ -81,12 +74,14 @@ CONFIG_CFG80211_WEXT=y
8174
CONFIG_MAC80211=y
8275
CONFIG_RFKILL=y
8376
CONFIG_RFKILL_INPUT=y
77+
CONFIG_PCI=y
78+
CONFIG_PCI_MSI=y
79+
CONFIG_PCI_IMX6=y
8480
CONFIG_DEVTMPFS=y
8581
CONFIG_DEVTMPFS_MOUNT=y
8682
# CONFIG_STANDALONE is not set
8783
CONFIG_FW_LOADER_USER_HELPER=y
8884
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
89-
CONFIG_CMA_SIZE_MBYTES=64
9085
CONFIG_IMX_WEIM=y
9186
CONFIG_CONNECTOR=y
9287
CONFIG_MTD=y
@@ -100,14 +95,12 @@ CONFIG_MTD_CFI_STAA=y
10095
CONFIG_MTD_PHYSMAP=y
10196
CONFIG_MTD_PHYSMAP_OF=y
10297
CONFIG_MTD_DATAFLASH=y
103-
CONFIG_MTD_M25P80=y
10498
CONFIG_MTD_SST25L=y
10599
CONFIG_MTD_RAW_NAND=y
106100
CONFIG_MTD_NAND_GPMI_NAND=y
107101
CONFIG_MTD_NAND_VF610_NFC=y
108102
CONFIG_MTD_NAND_MXC=y
109103
CONFIG_MTD_SPI_NOR=y
110-
CONFIG_SPI_FSL_QUADSPI=y
111104
CONFIG_MTD_UBI=y
112105
CONFIG_MTD_UBI_FASTMAP=y
113106
CONFIG_MTD_UBI_BLOCK=y
@@ -118,6 +111,7 @@ CONFIG_EEPROM_AT24=y
118111
CONFIG_EEPROM_AT25=y
119112
# CONFIG_SCSI_PROC_FS is not set
120113
CONFIG_BLK_DEV_SD=y
114+
# CONFIG_BLK_DEV_BSG is not set
121115
CONFIG_SCSI_CONSTANTS=y
122116
CONFIG_SCSI_LOGGING=y
123117
CONFIG_SCSI_SCAN_ASYNC=y
@@ -127,7 +121,6 @@ CONFIG_AHCI_IMX=y
127121
CONFIG_PATA_IMX=y
128122
CONFIG_NETDEVICES=y
129123
# CONFIG_NET_VENDOR_BROADCOM is not set
130-
CONFIG_CS89x0=y
131124
CONFIG_CS89x0_PLATFORM=y
132125
# CONFIG_NET_VENDOR_FARADAY is not set
133126
# CONFIG_NET_VENDOR_INTEL is not set
@@ -140,9 +133,8 @@ CONFIG_SMC91X=y
140133
CONFIG_SMC911X=y
141134
CONFIG_SMSC911X=y
142135
# CONFIG_NET_VENDOR_STMICRO is not set
143-
CONFIG_AT803X_PHY=y
144136
CONFIG_MICREL_PHY=y
145-
CONFIG_SMSC_PHY=y
137+
CONFIG_AT803X_PHY=y
146138
CONFIG_USB_PEGASUS=m
147139
CONFIG_USB_RTL8150=m
148140
CONFIG_USB_RTL8152=y
@@ -205,6 +197,7 @@ CONFIG_I2C_ALGOPCA=m
205197
CONFIG_I2C_GPIO=y
206198
CONFIG_I2C_IMX=y
207199
CONFIG_SPI=y
200+
CONFIG_SPI_FSL_QUADSPI=y
208201
CONFIG_SPI_GPIO=y
209202
CONFIG_SPI_IMX=y
210203
CONFIG_SPI_FSL_DSPI=y
@@ -213,14 +206,13 @@ CONFIG_PINCTRL_IMX8MN=y
213206
CONFIG_PINCTRL_IMX8MP=y
214207
CONFIG_PINCTRL_IMX8MQ=y
215208
CONFIG_GPIO_SYSFS=y
209+
CONFIG_GPIO_MXC=y
216210
CONFIG_GPIO_SIOX=m
217211
CONFIG_GPIO_MAX732X=y
218-
CONFIG_GPIO_MC9S08DZ60=y
219212
CONFIG_GPIO_PCA953X=y
220213
CONFIG_GPIO_PCF857X=y
221214
CONFIG_GPIO_STMPE=y
222215
CONFIG_GPIO_74X164=y
223-
CONFIG_GPIO_MXC=y
224216
CONFIG_POWER_RESET=y
225217
CONFIG_POWER_RESET_SYSCON=y
226218
CONFIG_POWER_RESET_SYSCON_POWEROFF=y
@@ -234,8 +226,8 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y
234226
CONFIG_CPU_THERMAL=y
235227
CONFIG_IMX_THERMAL=y
236228
CONFIG_WATCHDOG=y
237-
CONFIG_DA9062_WATCHDOG=y
238229
CONFIG_DA9063_WATCHDOG=m
230+
CONFIG_DA9062_WATCHDOG=y
239231
CONFIG_RN5T618_WATCHDOG=y
240232
CONFIG_IMX2_WDT=y
241233
CONFIG_IMX7ULP_WDT=y
@@ -246,7 +238,6 @@ CONFIG_MFD_MC13XXX_SPI=y
246238
CONFIG_MFD_MC13XXX_I2C=y
247239
CONFIG_MFD_RN5T618=y
248240
CONFIG_MFD_STMPE=y
249-
CONFIG_REGULATOR=y
250241
CONFIG_REGULATOR_FIXED_VOLTAGE=y
251242
CONFIG_REGULATOR_ANATOP=y
252243
CONFIG_REGULATOR_DA9052=y
@@ -262,17 +253,13 @@ CONFIG_RC_CORE=y
262253
CONFIG_RC_DEVICES=y
263254
CONFIG_IR_GPIO_CIR=y
264255
CONFIG_MEDIA_SUPPORT=y
265-
CONFIG_MEDIA_CAMERA_SUPPORT=y
266-
CONFIG_MEDIA_CONTROLLER=y
267-
CONFIG_VIDEO_V4L2_SUBDEV_API=y
268256
CONFIG_MEDIA_USB_SUPPORT=y
269257
CONFIG_USB_VIDEO_CLASS=m
270258
CONFIG_V4L_PLATFORM_DRIVERS=y
271259
CONFIG_VIDEO_MUX=y
272260
CONFIG_V4L_MEM2MEM_DRIVERS=y
273261
CONFIG_VIDEO_CODA=m
274262
CONFIG_VIDEO_IMX_PXP=y
275-
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
276263
CONFIG_VIDEO_ADV7180=m
277264
CONFIG_VIDEO_OV2680=m
278265
CONFIG_VIDEO_OV5640=m
@@ -307,12 +294,10 @@ CONFIG_SND_USB_AUDIO=m
307294
CONFIG_SND_SOC=y
308295
CONFIG_SND_SOC_FSL_ASRC=y
309296
CONFIG_SND_IMX_SOC=y
310-
CONFIG_SND_SOC_PHYCORE_AC97=y
311297
CONFIG_SND_SOC_EUKREA_TLV320=y
312298
CONFIG_SND_SOC_IMX_ES8328=y
313299
CONFIG_SND_SOC_IMX_SGTL5000=y
314300
CONFIG_SND_SOC_IMX_SPDIF=y
315-
CONFIG_SND_SOC_IMX_MC13783=y
316301
CONFIG_SND_SOC_FSL_ASOC_CARD=y
317302
CONFIG_SND_SOC_AC97_CODEC=y
318303
CONFIG_SND_SOC_CS42XX8_I2C=y
@@ -324,7 +309,6 @@ CONFIG_HID_MULTITOUCH=y
324309
CONFIG_USB=y
325310
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
326311
CONFIG_USB_EHCI_HCD=y
327-
CONFIG_USB_EHCI_MXC=y
328312
CONFIG_USB_ACM=m
329313
CONFIG_USB_STORAGE=y
330314
CONFIG_USB_CHIPIDEA=y
@@ -339,7 +323,6 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m
339323
CONFIG_NOP_USB_XCEIV=y
340324
CONFIG_USB_MXS_PHY=y
341325
CONFIG_USB_GADGET=y
342-
CONFIG_USB_FSL_USB2=y
343326
CONFIG_USB_CONFIGFS=y
344327
CONFIG_USB_CONFIGFS_SERIAL=y
345328
CONFIG_USB_CONFIGFS_ACM=y
@@ -388,11 +371,11 @@ CONFIG_RTC_DRV_ISL1208=y
388371
CONFIG_RTC_DRV_PCF8523=y
389372
CONFIG_RTC_DRV_PCF8563=y
390373
CONFIG_RTC_DRV_M41T80=y
374+
CONFIG_RTC_DRV_RC5T619=y
391375
CONFIG_RTC_DRV_DA9063=y
392376
CONFIG_RTC_DRV_MC13XXX=y
393377
CONFIG_RTC_DRV_MXC=y
394378
CONFIG_RTC_DRV_MXC_V2=y
395-
CONFIG_RTC_DRV_RC5T619=y
396379
CONFIG_RTC_DRV_SNVS=y
397380
CONFIG_DMADEVICES=y
398381
CONFIG_FSL_EDMA=y
@@ -469,13 +452,14 @@ CONFIG_CRC_CCITT=m
469452
CONFIG_CRC_T10DIF=y
470453
CONFIG_CRC7=m
471454
CONFIG_LIBCRC32C=m
455+
CONFIG_CMA_SIZE_MBYTES=64
472456
CONFIG_FONTS=y
473457
CONFIG_FONT_8x8=y
474458
CONFIG_FONT_8x16=y
475459
CONFIG_PRINTK_TIME=y
460+
# CONFIG_DEBUG_BUGVERBOSE is not set
476461
CONFIG_MAGIC_SYSRQ=y
477462
CONFIG_DEBUG_FS=y
478463
# CONFIG_SCHED_DEBUG is not set
479464
CONFIG_PROVE_LOCKING=y
480-
# CONFIG_DEBUG_BUGVERBOSE is not set
481465
# CONFIG_FTRACE is not set

0 commit comments

Comments
 (0)