From: xxh <xxh@rock-chips.com>
Date: Wed, 22 Apr 2015 00:52:02 +0000 (+0800)
Subject: update default config for esp8089 wifi.
X-Git-Tag: firefly_0821_release~4209
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=991b070e0b727ddbf37793809acf63634b645d42;p=firefly-linux-kernel-4.4.55.git

update default config for esp8089 wifi.
---

diff --git a/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/Kconfig b/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/Kconfig
index b3bac7d306df..20fc17765773 100755
--- a/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/Kconfig
+++ b/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/Kconfig
@@ -1,4 +1,22 @@
 config ESP8089
-	tristate "Eagle WLAN driver"
-	depends on MMC && MAC80211
+      depends on WLAN_80211 && MMC
+      select WIRELESS_EXT
+      select WEXT_PRIV
+      select CFG80211
+      select MAC80211
+	  select NL80211_TESTMODE
+      bool "Espressif 8089 sdio Wi-Fi"
+      ---help---
+        Espressif 8089 sdio Wi-Fi support
+	
+  config BK3515A_COMBO
+	  depends on ESP8089
+	  select WIRELESS_EXT
+	  select WEXT_PRIV
+	  select CFG80211
+	  select MAC80211
+	  select NL80211_TESTMODE
+	  bool "Espressif 8089 sdio Wi-Fi combo with BK3515A bluetooth"
+	  ---help---
+	    RK Wi-Fi+BT+[GPS optional] Combo module support
 
diff --git a/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/Makefile b/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/Makefile
index e09a94eaf538..392bcf5974f0 100755
--- a/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/Makefile
@@ -1,9 +1,8 @@
 # copyright (c) 2011 - 2012 espressif system
-
 DRIVER_NAME := wlan
 include drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_config.mk
 
-EXTRA_CFLAGS += -DDEBUG -DSIP_DEBUG -DFAST_TX_STATUS -DKERNEL_IV_WAR -DRX_SENDUP_SYNC -DHAS_FW -DTEST_MODE -DESP_ANDROID_LOGGER -DESP_CLASS -DESP_PREALLOC
+EXTRA_CFLAGS += -DDEBUG -DSIP_DEBUG -DFAST_TX_STATUS -DKERNEL_IV_WAR -DRX_SENDUP_SYNC -DHAS_FW -DTEST_MODE -DESP_ANDROID_LOGGER  -DESP_CLASS -DESP_PREALLOC -DHAS_INIT_DATA
 
 obj-$(CONFIG_ESP8089) := $(DRIVER_NAME).o
 $(DRIVER_NAME)-y += esp_init.o
@@ -22,18 +21,3 @@ $(DRIVER_NAME)-y += esp_utils.o
 $(DRIVER_NAME)-y += esp_pm.o
 $(DRIVER_NAME)-y += testmode.o
 
-$(DRIVER_NAME):
-	$(MAKE) ARCH=$(ARCH) -C $(KSRC) M=$(MODPATH) modules
-
-.PHONE:clean
-clean:
-	$(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(MODPATH) clean 
-
-#else
-#KDIR ?= /lib/modules/`uname -r`/build
-##KDIR ?= /home/espressif/src/sdio/cleanup
-
-#default:
-#	$(MAKE) -C $(KDIR) M=$$PWD
-
-#endif
diff --git a/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_conf.h b/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_conf.h
index f12a449130bd..4bbae428d2a2 100755
--- a/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_conf.h
+++ b/drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_conf.h
@@ -8,6 +8,6 @@
 #ifndef _ESP_CONF_H_
 #define _ESP_CONF_H_
 
-#define INIT_DATA_CONF_BUF "crystal_26M_en=0;test_xtal=0;sdio_configure=2;bt_configure=0;bt_protocol=0;dual_ant_configure=0;test_uart_configure=2;share_xtal=0;gpio_wake=0;no_auto_sleep=0;ext_rst=0;wakeup_gpio=12;ate_test=0;speed_suspend=1;$"
+#define INIT_DATA_CONF_BUF "crystal_26M_en=1;test_xtal=0;sdio_configure=2;bt_configure=0;bt_protocol=0;dual_ant_configure=0;test_uart_configure=2;share_xtal=0;gpio_wake=0;no_auto_sleep=0;ext_rst=0;wakeup_gpio=12;ate_test=0;speed_suspend=1;$"
 
 #endif /*_ESP_CONF_H_ */