diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-06-19 10:25:22 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-06-21 11:58:49 +0200 |
| commit | 3fb9155a135c38af46516a4b36b1f1320531085c (patch) | |
| tree | 8f670057ea8684760b15f35755bdb57b0ab10b43 /arch/arm/configs/apalis_imx6_defconfig | |
| parent | b837d7a5b1debc506273d235f83540d3e7fa0ec8 (diff) | |
(apalis|colibri)*_defconfig: Add new defconfigs for 4.14 kernel
No options where added or removed in this commit. A simple
make (apalis|colibri)*_defconfig
make savedefconfig
cp defconfig arch/arm/boot/(apalis|colibri)*_defconfig
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'arch/arm/configs/apalis_imx6_defconfig')
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index e79f5e0df8aa..de5995c1ee91 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -30,7 +30,6 @@ CONFIG_PCI_IMX6=y CONFIG_SMP=y CONFIG_VMSPLIT_2G=y CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_AEABI=y CONFIG_HIGHMEM=y CONFIG_CMA=y CONFIG_UACCESS_WITH_MEMCPY=y @@ -77,7 +76,6 @@ CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_LL=y CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_RFKILL=y @@ -133,8 +131,6 @@ CONFIG_MICREL_PHY=y CONFIG_PPP=m CONFIG_USB_USBNET=y # CONFIG_RTL_CARDS is not set -CONFIG_INPUT_POLLDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_IMX=y @@ -147,7 +143,6 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_SERIO_SERPORT=m # CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y @@ -198,9 +193,6 @@ CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_VIDEO_MXC_PXP_V4L2=y CONFIG_SOC_CAMERA=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -# CONFIG_DVB_AU8522_V4L is not set -# CONFIG_DVB_TUNER_DIB0070 is not set -# CONFIG_DVB_TUNER_DIB0090 is not set CONFIG_DRM=y CONFIG_DRM_VIVANTE=y CONFIG_FB_MXS=y @@ -273,7 +265,6 @@ CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_ESDHC_IMX=y -CONFIG_MXC_GPU_VIV=y CONFIG_MXC_IPU=y CONFIG_MXC_MIPI_CSI2=y CONFIG_NEW_LEDS=y @@ -296,9 +287,9 @@ CONFIG_IMX_SDMA=y CONFIG_MXC_PXP_V2=y # CONFIG_MX3_IPU is not set CONFIG_STAGING=y -CONFIG_STMPE_ADC=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y +CONFIG_STMPE_ADC=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_EXT4_FS=y @@ -343,8 +334,6 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_UTF8=y CONFIG_PRINTK_TIME=y CONFIG_DEBUG_FS=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10 # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set @@ -353,7 +342,6 @@ CONFIG_DEBUG_USER=y CONFIG_SECURITYFS=y CONFIG_CRYPTO_ECDH=y CONFIG_CRYPTO_USER=y -CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=y |