Commit e2f42a99 authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Shawn Guo

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: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 9358356d
...@@ -28,9 +28,6 @@ CONFIG_SOC_IMX6UL=y ...@@ -28,9 +28,6 @@ CONFIG_SOC_IMX6UL=y
CONFIG_SOC_IMX7D=y CONFIG_SOC_IMX7D=y
CONFIG_SOC_IMX7ULP=y CONFIG_SOC_IMX7ULP=y
CONFIG_SOC_VF610=y CONFIG_SOC_VF610=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_IMX6=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_ARM_PSCI=y CONFIG_ARM_PSCI=y
CONFIG_HIGHMEM=y CONFIG_HIGHMEM=y
...@@ -58,7 +55,6 @@ CONFIG_MODULES=y ...@@ -58,7 +55,6 @@ CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_BINFMT_MISC=m CONFIG_BINFMT_MISC=m
CONFIG_NET=y CONFIG_NET=y
CONFIG_PACKET=y CONFIG_PACKET=y
...@@ -66,9 +62,6 @@ CONFIG_UNIX=y ...@@ -66,9 +62,6 @@ CONFIG_UNIX=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_CAN=y CONFIG_CAN=y
CONFIG_CAN_FLEXCAN=y CONFIG_CAN_FLEXCAN=y
...@@ -81,12 +74,14 @@ CONFIG_CFG80211_WEXT=y ...@@ -81,12 +74,14 @@ CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=y CONFIG_MAC80211=y
CONFIG_RFKILL=y CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_INPUT=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_IMX6=y
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set # CONFIG_STANDALONE is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_IMX_WEIM=y CONFIG_IMX_WEIM=y
CONFIG_CONNECTOR=y CONFIG_CONNECTOR=y
CONFIG_MTD=y CONFIG_MTD=y
...@@ -100,14 +95,12 @@ CONFIG_MTD_CFI_STAA=y ...@@ -100,14 +95,12 @@ CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_DATAFLASH=y CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_SST25L=y CONFIG_MTD_SST25L=y
CONFIG_MTD_RAW_NAND=y CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_NAND_VF610_NFC=y CONFIG_MTD_NAND_VF610_NFC=y
CONFIG_MTD_NAND_MXC=y CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPI_NOR=y
CONFIG_SPI_FSL_QUADSPI=y
CONFIG_MTD_UBI=y CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP=y
CONFIG_MTD_UBI_BLOCK=y CONFIG_MTD_UBI_BLOCK=y
...@@ -118,6 +111,7 @@ CONFIG_EEPROM_AT24=y ...@@ -118,6 +111,7 @@ CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y CONFIG_EEPROM_AT25=y
# CONFIG_SCSI_PROC_FS is not set # CONFIG_SCSI_PROC_FS is not set
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SCAN_ASYNC=y
...@@ -127,7 +121,6 @@ CONFIG_AHCI_IMX=y ...@@ -127,7 +121,6 @@ CONFIG_AHCI_IMX=y
CONFIG_PATA_IMX=y CONFIG_PATA_IMX=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
CONFIG_CS89x0=y
CONFIG_CS89x0_PLATFORM=y CONFIG_CS89x0_PLATFORM=y
# CONFIG_NET_VENDOR_FARADAY is not set # CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
...@@ -140,9 +133,8 @@ CONFIG_SMC91X=y ...@@ -140,9 +133,8 @@ CONFIG_SMC91X=y
CONFIG_SMC911X=y CONFIG_SMC911X=y
CONFIG_SMSC911X=y CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
CONFIG_AT803X_PHY=y
CONFIG_MICREL_PHY=y CONFIG_MICREL_PHY=y
CONFIG_SMSC_PHY=y CONFIG_AT803X_PHY=y
CONFIG_USB_PEGASUS=m CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=y CONFIG_USB_RTL8152=y
...@@ -205,6 +197,7 @@ CONFIG_I2C_ALGOPCA=m ...@@ -205,6 +197,7 @@ CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_GPIO=y CONFIG_I2C_GPIO=y
CONFIG_I2C_IMX=y CONFIG_I2C_IMX=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_FSL_QUADSPI=y
CONFIG_SPI_GPIO=y CONFIG_SPI_GPIO=y
CONFIG_SPI_IMX=y CONFIG_SPI_IMX=y
CONFIG_SPI_FSL_DSPI=y CONFIG_SPI_FSL_DSPI=y
...@@ -213,14 +206,13 @@ CONFIG_PINCTRL_IMX8MN=y ...@@ -213,14 +206,13 @@ CONFIG_PINCTRL_IMX8MN=y
CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MP=y
CONFIG_PINCTRL_IMX8MQ=y CONFIG_PINCTRL_IMX8MQ=y
CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MXC=y
CONFIG_GPIO_SIOX=m CONFIG_GPIO_SIOX=m
CONFIG_GPIO_MAX732X=y CONFIG_GPIO_MAX732X=y
CONFIG_GPIO_MC9S08DZ60=y
CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCF857X=y CONFIG_GPIO_PCF857X=y
CONFIG_GPIO_STMPE=y CONFIG_GPIO_STMPE=y
CONFIG_GPIO_74X164=y CONFIG_GPIO_74X164=y
CONFIG_GPIO_MXC=y
CONFIG_POWER_RESET=y CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON=y
CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y
...@@ -234,8 +226,8 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y ...@@ -234,8 +226,8 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
CONFIG_IMX_THERMAL=y CONFIG_IMX_THERMAL=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_DA9062_WATCHDOG=y
CONFIG_DA9063_WATCHDOG=m CONFIG_DA9063_WATCHDOG=m
CONFIG_DA9062_WATCHDOG=y
CONFIG_RN5T618_WATCHDOG=y CONFIG_RN5T618_WATCHDOG=y
CONFIG_IMX2_WDT=y CONFIG_IMX2_WDT=y
CONFIG_IMX7ULP_WDT=y CONFIG_IMX7ULP_WDT=y
...@@ -246,7 +238,6 @@ CONFIG_MFD_MC13XXX_SPI=y ...@@ -246,7 +238,6 @@ CONFIG_MFD_MC13XXX_SPI=y
CONFIG_MFD_MC13XXX_I2C=y CONFIG_MFD_MC13XXX_I2C=y
CONFIG_MFD_RN5T618=y CONFIG_MFD_RN5T618=y
CONFIG_MFD_STMPE=y CONFIG_MFD_STMPE=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_ANATOP=y CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_DA9052=y CONFIG_REGULATOR_DA9052=y
...@@ -262,9 +253,6 @@ CONFIG_RC_CORE=y ...@@ -262,9 +253,6 @@ CONFIG_RC_CORE=y
CONFIG_RC_DEVICES=y CONFIG_RC_DEVICES=y
CONFIG_IR_GPIO_CIR=y CONFIG_IR_GPIO_CIR=y
CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_MEDIA_USB_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS=m
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
...@@ -272,7 +260,6 @@ CONFIG_VIDEO_MUX=y ...@@ -272,7 +260,6 @@ CONFIG_VIDEO_MUX=y
CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CODA=m
CONFIG_VIDEO_IMX_PXP=y CONFIG_VIDEO_IMX_PXP=y
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_ADV7180=m
CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2680=m
CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5640=m
...@@ -307,12 +294,10 @@ CONFIG_SND_USB_AUDIO=m ...@@ -307,12 +294,10 @@ CONFIG_SND_USB_AUDIO=m
CONFIG_SND_SOC=y CONFIG_SND_SOC=y
CONFIG_SND_SOC_FSL_ASRC=y CONFIG_SND_SOC_FSL_ASRC=y
CONFIG_SND_IMX_SOC=y CONFIG_SND_IMX_SOC=y
CONFIG_SND_SOC_PHYCORE_AC97=y
CONFIG_SND_SOC_EUKREA_TLV320=y CONFIG_SND_SOC_EUKREA_TLV320=y
CONFIG_SND_SOC_IMX_ES8328=y CONFIG_SND_SOC_IMX_ES8328=y
CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_SGTL5000=y
CONFIG_SND_SOC_IMX_SPDIF=y CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_SND_SOC_FSL_ASOC_CARD=y CONFIG_SND_SOC_FSL_ASOC_CARD=y
CONFIG_SND_SOC_AC97_CODEC=y CONFIG_SND_SOC_AC97_CODEC=y
CONFIG_SND_SOC_CS42XX8_I2C=y CONFIG_SND_SOC_CS42XX8_I2C=y
...@@ -324,7 +309,6 @@ CONFIG_HID_MULTITOUCH=y ...@@ -324,7 +309,6 @@ CONFIG_HID_MULTITOUCH=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
CONFIG_USB_ACM=m CONFIG_USB_ACM=m
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA=y
...@@ -339,7 +323,6 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m ...@@ -339,7 +323,6 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m
CONFIG_NOP_USB_XCEIV=y CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_MXS_PHY=y CONFIG_USB_MXS_PHY=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_FSL_USB2=y
CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS=y
CONFIG_USB_CONFIGFS_SERIAL=y CONFIG_USB_CONFIGFS_SERIAL=y
CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ACM=y
...@@ -388,11 +371,11 @@ CONFIG_RTC_DRV_ISL1208=y ...@@ -388,11 +371,11 @@ CONFIG_RTC_DRV_ISL1208=y
CONFIG_RTC_DRV_PCF8523=y CONFIG_RTC_DRV_PCF8523=y
CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_PCF8563=y
CONFIG_RTC_DRV_M41T80=y CONFIG_RTC_DRV_M41T80=y
CONFIG_RTC_DRV_RC5T619=y
CONFIG_RTC_DRV_DA9063=y CONFIG_RTC_DRV_DA9063=y
CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MC13XXX=y
CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_MXC=y
CONFIG_RTC_DRV_MXC_V2=y CONFIG_RTC_DRV_MXC_V2=y
CONFIG_RTC_DRV_RC5T619=y
CONFIG_RTC_DRV_SNVS=y CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_FSL_EDMA=y CONFIG_FSL_EDMA=y
...@@ -469,13 +452,14 @@ CONFIG_CRC_CCITT=m ...@@ -469,13 +452,14 @@ CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m CONFIG_CRC7=m
CONFIG_LIBCRC32C=m CONFIG_LIBCRC32C=m
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_FONTS=y CONFIG_FONTS=y
CONFIG_FONT_8x8=y CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y CONFIG_FONT_8x16=y
CONFIG_PRINTK_TIME=y CONFIG_PRINTK_TIME=y
# CONFIG_DEBUG_BUGVERBOSE is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHED_DEBUG is not set
CONFIG_PROVE_LOCKING=y CONFIG_PROVE_LOCKING=y
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_FTRACE is not set # CONFIG_FTRACE is not set
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment