diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-09-28 10:49:12 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2017-10-02 16:43:56 +0200 |
commit | b893ccb6ee38add7efeb4071035fc56973509e0c (patch) | |
tree | f6edb35d8ebc002aab79de5c810759b514a0906d /arch/arm/configs/colibri_imx7_defconfig | |
parent | 16305502f3ada7818cfeb0c86fb5c0a1b852a147 (diff) |
toradex defconfigs: synchronize with defconfigs in oe
Synchronize the defconfigs with changes done in meta-toradex-nxp.
Normalize the defconfigs by
make ..._defconfig
make savedevconig
cp defconfig arch/arm/configs/..._defconfig
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'arch/arm/configs/colibri_imx7_defconfig')
-rw-r--r-- | arch/arm/configs/colibri_imx7_defconfig | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/configs/colibri_imx7_defconfig b/arch/arm/configs/colibri_imx7_defconfig index 7e430ac486e9..0284033cf391 100644 --- a/arch/arm/configs/colibri_imx7_defconfig +++ b/arch/arm/configs/colibri_imx7_defconfig @@ -107,6 +107,7 @@ CONFIG_BT_HIDP=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y @@ -168,11 +169,7 @@ CONFIG_USB_USBNET=m # CONFIG_USB_NET_NET1080 is not set # CONFIG_USB_NET_CDC_SUBSET is not set # CONFIG_USB_NET_ZAURUS is not set -CONFIG_USB_ZD1201=m -CONFIG_RT2X00=m -CONFIG_RT2800USB=m -CONFIG_RTL8192CU=m -# CONFIG_RTLWIFI_DEBUG is not set +# CONFIG_WLAN is not set CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y @@ -183,8 +180,8 @@ CONFIG_KEYBOARD_IMX=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_AD7879=y CONFIG_TOUCHSCREEN_AD7879_I2C=y -CONFIG_TOUCHSCREEN_FUSION_F0710A=m CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_FUSION_F0710A=m # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set |