From f46a13805c25f26b1c6d3af6d628ae3983e3acea Mon Sep 17 00:00:00 2001
From: Anna Horstmann <ahorstmann@phytec.com>
Date: Mon, 23 Oct 2017 13:25:37 -0700
Subject: [PATCH] Revert "configs: imx7_phyboard_zeta_defconfig: disable WiFi
 in kernel"

This reverts commit c20bbf7477eebb94633fcce87ccc60689c578563.

diff --git a/arch/arm/configs/imx7_phyboard_zeta_defconfig b/arch/arm/configs/imx7_phyboard_zeta_defconfig
index 1c3e28a..c2812b7 100644
--- a/arch/arm/configs/imx7_phyboard_zeta_defconfig
+++ b/arch/arm/configs/imx7_phyboard_zeta_defconfig
@@ -83,6 +83,8 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIBCM203X=y
 CONFIG_BT_ATH3K=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
@@ -147,7 +149,13 @@ CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_CDC_EEM=m
-# CONFIG_WLAN is not set
+CONFIG_BCMDHD=m
+CONFIG_BCMDHD_SDIO=m
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/bcmdhd.cal"
+CONFIG_IWLWIFI=m
+CONFIG_IWLMVM=m
+# CONFIG_RTL_CARDS is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
@@ -336,7 +344,6 @@ CONFIG_MXC_HDMI_CEC=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -405,8 +412,6 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_SECURITYFS=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_LRW=y
 CONFIG_CRYPTO_XTS=y
@@ -420,7 +425,6 @@ CONFIG_CRYPTO_RMD320=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_TGR192=y
 CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=y
 CONFIG_CRYPTO_CAMELLIA=y
 CONFIG_CRYPTO_DES=y
@@ -435,7 +439,6 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
-CONFIG_AVERAGE=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-- 
1.9.1