[Feature][S300]task-view-1245] add wifi rtl8192fs support, compile options
Change-Id: I918e1b2cb1dcb9c8f424e60a3d66e62a2447d25d
diff --git a/Makefile b/Makefile
index 5f29e93..1b473df 100755
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@
DCXO_R306 = DCXO=yes
endif
+wifi_proj:=$(shell echo $(PATH_PRJ) | awk -F "/" '{print $$2}')
+
.PHONY:all
all:copy boot ap pack
@echo OK
@@ -41,6 +43,12 @@
echo "CUST is defined and has a value: $(CUST)"
cp -rf $(PATH_PRJ)/$(CUST)/* .
endif
+ifeq ($(wifi),)
+ echo "default use wifi rtl8192cd_92es_wpa2"
+else
+ echo "using wifi lynq/wifi/$(wifi_proj)/$(wifi), make sure config.linux file and Makefile of wireless is correct!!!"
+ cp -rf lynq/wifi/$(wifi_proj)/$(wifi)/* .
+endif
.PHONY:help
help:
@@ -53,7 +61,7 @@
@echo example CPE_TELKOMSEL : make AP_PRJ=prj_mifi_min BOOT_PRJ=mifi_mini_64 PACK_PRJ=prj_mifi PATH_PRJ=lynq/CPE_TELKOMSEL
@echo example R307 : make AP_PRJ=prj_cpe_min BOOT_PRJ=ufi_mini PACK_PRJ=prj_cpe PATH_PRJ=lynq/R307
@echo example R307L : make AP_PRJ=prj_cpe_min BOOT_PRJ=ufi_mini PACK_PRJ=prj_cpe PATH_PRJ=lynq/R307L
- @echo example S300 : make AP_PRJ=prj_mifi_min BOOT_PRJ=mifi_mini_64 PACK_PRJ=prj_mifi PATH_PRJ=lynq/S300
+ @echo example S300 : make AP_PRJ=prj_mifi_min BOOT_PRJ=mifi_mini_64 PACK_PRJ=prj_mifi PATH_PRJ=lynq/S300 [wifi=rtl8192cd_92fs]
@echo example S300_COMMON : make AP_PRJ=prj_mifi_min BOOT_PRJ=mifi_mini_64 PACK_PRJ=prj_mifi PATH_PRJ=lynq/S300_COMMON
@echo example MD310 : make AP_PRJ=prj_cpe_min BOOT_PRJ=ufi_mini PACK_PRJ=prj_cpe PATH_PRJ=lynq/MD310
@echo example MD310 TSEL/XL/HKM/HIFI: make AP_PRJ=prj_cpe_min BOOT_PRJ=ufi_mini PACK_PRJ=prj_cpe PATH_PRJ=lynq/MD310 CUST=TSEL/XL/HKM/HIFI
diff --git a/lynq/wifi/S300/rtl8192cd_92fs/ap/os/linux/linux-3.4.x/drivers/net/wireless/Kconfig b/lynq/wifi/S300/rtl8192cd_92fs/ap/os/linux/linux-3.4.x/drivers/net/wireless/Kconfig
old mode 100644
new mode 100755
index 3e608fb..5faf33d
--- a/lynq/wifi/S300/rtl8192cd_92fs/ap/os/linux/linux-3.4.x/drivers/net/wireless/Kconfig
+++ b/lynq/wifi/S300/rtl8192cd_92fs/ap/os/linux/linux-3.4.x/drivers/net/wireless/Kconfig
@@ -276,8 +276,9 @@
source "drivers/net/wireless/ath/Kconfig"
source "drivers/net/wireless/b43/Kconfig"
source "drivers/net/wireless/b43legacy/Kconfig"
-source "drivers/net/wireless/rtl8192cd_92es/Kconfig"
-source "drivers/net/wireless/rtl8192cd_92es_wpa2/Kconfig"
+source "drivers/net/wireless/rtl8192cd_92fs/Kconfig"
+#source "drivers/net/wireless/rtl8192cd_92es/Kconfig"
+#source "drivers/net/wireless/rtl8192cd_92es_wpa2/Kconfig"
source "drivers/net/wireless/brcm80211/Kconfig"
source "drivers/net/wireless/hostap/Kconfig"
source "drivers/net/wireless/ipw2x00/Kconfig"
diff --git a/lynq/wifi/S300/rtl8192cd_92fs/ap/os/linux/linux-3.4.x/drivers/net/wireless/Makefile b/lynq/wifi/S300/rtl8192cd_92fs/ap/os/linux/linux-3.4.x/drivers/net/wireless/Makefile
old mode 100644
new mode 100755
index 17e88cd..49f7c93
--- a/lynq/wifi/S300/rtl8192cd_92fs/ap/os/linux/linux-3.4.x/drivers/net/wireless/Makefile
+++ b/lynq/wifi/S300/rtl8192cd_92fs/ap/os/linux/linux-3.4.x/drivers/net/wireless/Makefile
@@ -60,9 +60,10 @@
obj-$(CONFIG_MWIFIEX) += mwifiex/
#obj-$(CONFIG_BCMDHD) += bcmdhd/
+obj-$(CONFIG_RTL8192CD) += rtl8192cd_92fs/
#obj-$(CONFIG_RTL8192CD) += rtl8192cd_92es/
-obj-$(CONFIG_RTL_WIFI) += rtl8192cd_92es/
-obj-$(CONFIG_RTL_WIFI_WPA2) += rtl8192cd_92es_wpa2/
+#obj-$(CONFIG_RTL_WIFI) += rtl8192cd_92es/
+#obj-$(CONFIG_RTL_WIFI_WPA2) += rtl8192cd_92es_wpa2/
obj-$(CONFIG_ESP8089) += esp8089/
obj-$(CONFIG_XR_WLAN) += xradio/
obj-$(CONFIG_SSV6X5X) += ssv6x5x/
diff --git a/lynq/wifi/S300/rtl8192cd_92fs/ap/project/zx297520v3/prj_mifi_min/config/normal/config.linux b/lynq/wifi/S300/rtl8192cd_92fs/ap/project/zx297520v3/prj_mifi_min/config/normal/config.linux
index ddda286..3339fab 100755
--- a/lynq/wifi/S300/rtl8192cd_92fs/ap/project/zx297520v3/prj_mifi_min/config/normal/config.linux
+++ b/lynq/wifi/S300/rtl8192cd_92fs/ap/project/zx297520v3/prj_mifi_min/config/normal/config.linux
@@ -1113,8 +1113,9 @@
CONFIG_RTL8192CD=y
CONFIG_MIFI_WIFI=n
-CONFIG_RTL_WIFI_WPA2=y
-CONFIG_RTL_92E_SUPPORT=y
+#CONFIG_RTL_WIFI_WPA2 is not set
+CONFIG_RTL_92E_SUPPORT=n
+
#
# Enable WiMAX (Networking options) to see the WiMAX drivers
#