defconfig and cmdline changes for new wifi

- Disable 'predictable interface names' on the command line.
It seems random which of wlan0 and p2p0 get renamed to wlp1s0, so unless
we figure that out this actually gives a more stable interface naming
- Disable ATH10K and enable QCACLD-2.0. Config options are taken from AT.

Change-Id: I8c625e8d050efb4b65e6c1cbf3980e6654dbb969
diff --git a/boot.txt b/boot.txt
index 8d6c872..0e61229 100644
--- a/boot.txt
+++ b/boot.txt
@@ -12,7 +12,7 @@
     setenv root ${mmc_root}
 fi
 
-cmdline="console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 root=${root} rootfstype=ext4 rw rootwait init=/sbin/init"
+cmdline="console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 root=${root} rootfstype=ext4 rw rootwait init=/sbin/init net.ifnames=0"
 
 ext2load mmc ${bootdev}:1 ${loadaddr} ${image}
 ext2load mmc ${bootdev}:1 ${fdt_addr} ${fdt_file}
diff --git a/defconfig b/defconfig
index 85176b1..394cf89 100644
--- a/defconfig
+++ b/defconfig
@@ -12,10 +12,37 @@
 CONFIG_MFD_BD71837=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_WLAN=y
-CONFIG_ATH10K=y
-CONFIG_ATH10K_PCI=y
-CONFIG_ATH10K_AHB=y
-CONFIG_ATH10K_DEBUGFS=y
+CONFIG_ATH10K=n
+
+# QCACLD-2.0
+CONFIG_CFG80211_INTERNAL_REGDB=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_SPY=y
+CONFIG_QCA_CLD_WLAN=y
+# CONFIG_CLD_HL_SDIO_CORE is not set
+CONFIG_QCACLD_WLAN_LFR3=y
+CONFIG_PRIMA_WLAN_OKC=y
+CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
+CONFIG_WLAN_FEATURE_11W=y
+CONFIG_WLAN_FEATURE_LPSS=y
+CONFIG_QCOM_VOWIFI_11R=y
+CONFIG_WLAN_FEATURE_NAN=y
+CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
+CONFIG_QCOM_TDLS=y
+CONFIG_QCOM_LTE_COEX=y
+CONFIG_WLAN_OFFLOAD_PACKETS=y
+CONFIG_WLAN_FEATURE_MEMDUMP=y
+CONFIG_WLAN_SYNC_TSF=y
+# CONFIG_QCA_WIFI_AUTOMOTIVE_CONC is not set
+# CONFIG_WLAN_UDP_RESPONSE_OFFLOAD is not set
+# CONFIG_WLAN_WOW_PULSE is not set
+# CONFIG_DPTRACE_ENABLE is not set
+
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_SND_SOC_FSL_ASOC_CARD=y