[1/3] wifi: Switch wifi/qcom for wifi/qcom-flo

Message ID 1493331820-20072-1-git-send-email-john.stultz@linaro.org
State New
Headers show
Series
  • [1/3] wifi: Switch wifi/qcom for wifi/qcom-flo
Related show

Commit Message

John Stultz April 27, 2017, 10:23 p.m.
So the wifi logic under wifi/qcom ends up being
much more flo(nexus7) specific then I thought it
would be.

So put it under a more specific qcom-flo directory
and change the config options respectively

Cc: Rob Herring <rob.herring@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Vishal Bhoj <vishal.bhoj@linaro.org>
Cc: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>

---
 BoardConfig.mk                                     |   2 +-
 configs/flo_defconfig                              |   2 +-
 wifi/Kconfig                                       |   4 ++--
 wifi/device.mk                                     |   2 +-
 wifi/{qcom => qcom-flo}/Android.mk                 |   0
 wifi/qcom-flo/BoardConfig.mk                       |   2 ++
 wifi/{qcom => qcom-flo}/NOTICE                     |   0
 wifi/{qcom => qcom-flo}/WCNSS_cfg.dat              | Bin
 wifi/{qcom => qcom-flo}/WCNSS_qcom_cfg.ini         |   0
 wifi/{qcom => qcom-flo}/WCNSS_qcom_wlan_nv_deb.bin | Bin
 wifi/{qcom => qcom-flo}/WCNSS_qcom_wlan_nv_flo.bin | Bin
 wifi/{qcom => qcom-flo}/conn_init.c                |   0
 wifi/{qcom => qcom-flo}/device.mk                  |   0
 wifi/{qcom => qcom-flo}/qcom-wifi.rc               |   0
 wifi/{qcom => qcom-flo}/sepolicy/conn_init.te      |   0
 wifi/{qcom => qcom-flo}/sepolicy/file_contexts     |   0
 wifi/{qcom => qcom-flo}/start_qcom_wifi.sh         |   0
 wifi/{qcom => qcom-flo}/wfc_util_common.c          |   0
 wifi/{qcom => qcom-flo}/wfc_util_common.h          |   0
 wifi/{qcom => qcom-flo}/wfc_util_fctrl.c           |   0
 wifi/{qcom => qcom-flo}/wfc_util_fctrl.h           |   0
 wifi/{qcom => qcom-flo}/wfc_util_log.h             |   0
 wifi/{qcom => qcom-flo}/wfc_util_main.c            |   0
 wifi/{qcom => qcom-flo}/wfc_util_qcom.c            |   0
 wifi/{qcom => qcom-flo}/wfc_util_qcom.h            |   0
 wifi/qcom/BoardConfig.mk                           |   2 --
 26 files changed, 7 insertions(+), 7 deletions(-)
 rename wifi/{qcom => qcom-flo}/Android.mk (100%)
 create mode 100644 wifi/qcom-flo/BoardConfig.mk
 rename wifi/{qcom => qcom-flo}/NOTICE (100%)
 rename wifi/{qcom => qcom-flo}/WCNSS_cfg.dat (100%)
 rename wifi/{qcom => qcom-flo}/WCNSS_qcom_cfg.ini (100%)
 rename wifi/{qcom => qcom-flo}/WCNSS_qcom_wlan_nv_deb.bin (100%)
 rename wifi/{qcom => qcom-flo}/WCNSS_qcom_wlan_nv_flo.bin (100%)
 rename wifi/{qcom => qcom-flo}/conn_init.c (100%)
 rename wifi/{qcom => qcom-flo}/device.mk (100%)
 rename wifi/{qcom => qcom-flo}/qcom-wifi.rc (100%)
 rename wifi/{qcom => qcom-flo}/sepolicy/conn_init.te (100%)
 rename wifi/{qcom => qcom-flo}/sepolicy/file_contexts (100%)
 rename wifi/{qcom => qcom-flo}/start_qcom_wifi.sh (100%)
 rename wifi/{qcom => qcom-flo}/wfc_util_common.c (100%)
 rename wifi/{qcom => qcom-flo}/wfc_util_common.h (100%)
 rename wifi/{qcom => qcom-flo}/wfc_util_fctrl.c (100%)
 rename wifi/{qcom => qcom-flo}/wfc_util_fctrl.h (100%)
 rename wifi/{qcom => qcom-flo}/wfc_util_log.h (100%)
 rename wifi/{qcom => qcom-flo}/wfc_util_main.c (100%)
 rename wifi/{qcom => qcom-flo}/wfc_util_qcom.c (100%)
 rename wifi/{qcom => qcom-flo}/wfc_util_qcom.h (100%)
 delete mode 100644 wifi/qcom/BoardConfig.mk

-- 
2.7.4

Patch

diff --git a/BoardConfig.mk b/BoardConfig.mk
index a9da45e..11a1f20 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -45,4 +45,4 @@  define include-board-configs
  )
 endef
 
-$(call include-board-configs, wifi/qcom graphics/drm)
+$(call include-board-configs, wifi/qcom-flo graphics/drm)
diff --git a/configs/flo_defconfig b/configs/flo_defconfig
index c7ed9f6..dba5bb4 100644
--- a/configs/flo_defconfig
+++ b/configs/flo_defconfig
@@ -5,4 +5,4 @@  CONFIG_KERNEL_PATH="zImage.dtb"
 CONFIG_BOARD_KERNEL_CMDLINE="console=ttyHSL0,115200,n8 user_debug=31 console=ttyMSM0,115200,n8 androidboot.selinux=permissive"
 CONFIG_BOARD_KERNEL_BASE=0x80200000
 CONFIG_RAMDISK_OFFSET=0x02000000
-CONFIG_QCOM_WIFI=y
+CONFIG_QCOM_FLO_WIFI=y
diff --git a/wifi/Kconfig b/wifi/Kconfig
index 0611bd3..e3b3af6 100644
--- a/wifi/Kconfig
+++ b/wifi/Kconfig
@@ -4,8 +4,8 @@  menuconfig WIFI
 
 if WIFI
 
-config QCOM_WIFI
-	bool "Qualcomm WCNSS wifi support"
+config QCOM_FLO_WIFI
+	bool "Qualcomm WCNSS wifi support for Nexus7 devices"
 
 config TI_WILINK_WIFI
 	bool "TI WILINK wifi support"
diff --git a/wifi/device.mk b/wifi/device.mk
index fed3dc0..a894c10 100644
--- a/wifi/device.mk
+++ b/wifi/device.mk
@@ -18,6 +18,6 @@  PRODUCT_PROPERTY_OVERRIDES := \
 
 
 subdirs-true :=
-subdirs-$(CONFIG_QCOM_WIFI) += qcom
+subdirs-$(CONFIG_QCOM_FLO_WIFI) += qcom-flo
 subdirs-$(CONFIG_TI_WILINK_WIFI) += ti_wilink
 $(call inherit-product-dirs, $(subdirs-true))
diff --git a/wifi/qcom/Android.mk b/wifi/qcom-flo/Android.mk
similarity index 100%
rename from wifi/qcom/Android.mk
rename to wifi/qcom-flo/Android.mk
diff --git a/wifi/qcom-flo/BoardConfig.mk b/wifi/qcom-flo/BoardConfig.mk
new file mode 100644
index 0000000..d1d92d9
--- /dev/null
+++ b/wifi/qcom-flo/BoardConfig.mk
@@ -0,0 +1,2 @@ 
+BOARD_SEPOLICY_DIRS += $(if $(CONFIG_QCOM_FLO_WIFI), \
+	$(LOCAL_PATH)/sepolicy)
diff --git a/wifi/qcom/NOTICE b/wifi/qcom-flo/NOTICE
similarity index 100%
rename from wifi/qcom/NOTICE
rename to wifi/qcom-flo/NOTICE
diff --git a/wifi/qcom/WCNSS_cfg.dat b/wifi/qcom-flo/WCNSS_cfg.dat
similarity index 100%
rename from wifi/qcom/WCNSS_cfg.dat
rename to wifi/qcom-flo/WCNSS_cfg.dat
diff --git a/wifi/qcom/WCNSS_qcom_cfg.ini b/wifi/qcom-flo/WCNSS_qcom_cfg.ini
similarity index 100%
rename from wifi/qcom/WCNSS_qcom_cfg.ini
rename to wifi/qcom-flo/WCNSS_qcom_cfg.ini
diff --git a/wifi/qcom/WCNSS_qcom_wlan_nv_deb.bin b/wifi/qcom-flo/WCNSS_qcom_wlan_nv_deb.bin
similarity index 100%
rename from wifi/qcom/WCNSS_qcom_wlan_nv_deb.bin
rename to wifi/qcom-flo/WCNSS_qcom_wlan_nv_deb.bin
diff --git a/wifi/qcom/WCNSS_qcom_wlan_nv_flo.bin b/wifi/qcom-flo/WCNSS_qcom_wlan_nv_flo.bin
similarity index 100%
rename from wifi/qcom/WCNSS_qcom_wlan_nv_flo.bin
rename to wifi/qcom-flo/WCNSS_qcom_wlan_nv_flo.bin
diff --git a/wifi/qcom/conn_init.c b/wifi/qcom-flo/conn_init.c
similarity index 100%
rename from wifi/qcom/conn_init.c
rename to wifi/qcom-flo/conn_init.c
diff --git a/wifi/qcom/device.mk b/wifi/qcom-flo/device.mk
similarity index 100%
rename from wifi/qcom/device.mk
rename to wifi/qcom-flo/device.mk
diff --git a/wifi/qcom/qcom-wifi.rc b/wifi/qcom-flo/qcom-wifi.rc
similarity index 100%
rename from wifi/qcom/qcom-wifi.rc
rename to wifi/qcom-flo/qcom-wifi.rc
diff --git a/wifi/qcom/sepolicy/conn_init.te b/wifi/qcom-flo/sepolicy/conn_init.te
similarity index 100%
rename from wifi/qcom/sepolicy/conn_init.te
rename to wifi/qcom-flo/sepolicy/conn_init.te
diff --git a/wifi/qcom/sepolicy/file_contexts b/wifi/qcom-flo/sepolicy/file_contexts
similarity index 100%
rename from wifi/qcom/sepolicy/file_contexts
rename to wifi/qcom-flo/sepolicy/file_contexts
diff --git a/wifi/qcom/start_qcom_wifi.sh b/wifi/qcom-flo/start_qcom_wifi.sh
similarity index 100%
rename from wifi/qcom/start_qcom_wifi.sh
rename to wifi/qcom-flo/start_qcom_wifi.sh
diff --git a/wifi/qcom/wfc_util_common.c b/wifi/qcom-flo/wfc_util_common.c
similarity index 100%
rename from wifi/qcom/wfc_util_common.c
rename to wifi/qcom-flo/wfc_util_common.c
diff --git a/wifi/qcom/wfc_util_common.h b/wifi/qcom-flo/wfc_util_common.h
similarity index 100%
rename from wifi/qcom/wfc_util_common.h
rename to wifi/qcom-flo/wfc_util_common.h
diff --git a/wifi/qcom/wfc_util_fctrl.c b/wifi/qcom-flo/wfc_util_fctrl.c
similarity index 100%
rename from wifi/qcom/wfc_util_fctrl.c
rename to wifi/qcom-flo/wfc_util_fctrl.c
diff --git a/wifi/qcom/wfc_util_fctrl.h b/wifi/qcom-flo/wfc_util_fctrl.h
similarity index 100%
rename from wifi/qcom/wfc_util_fctrl.h
rename to wifi/qcom-flo/wfc_util_fctrl.h
diff --git a/wifi/qcom/wfc_util_log.h b/wifi/qcom-flo/wfc_util_log.h
similarity index 100%
rename from wifi/qcom/wfc_util_log.h
rename to wifi/qcom-flo/wfc_util_log.h
diff --git a/wifi/qcom/wfc_util_main.c b/wifi/qcom-flo/wfc_util_main.c
similarity index 100%
rename from wifi/qcom/wfc_util_main.c
rename to wifi/qcom-flo/wfc_util_main.c
diff --git a/wifi/qcom/wfc_util_qcom.c b/wifi/qcom-flo/wfc_util_qcom.c
similarity index 100%
rename from wifi/qcom/wfc_util_qcom.c
rename to wifi/qcom-flo/wfc_util_qcom.c
diff --git a/wifi/qcom/wfc_util_qcom.h b/wifi/qcom-flo/wfc_util_qcom.h
similarity index 100%
rename from wifi/qcom/wfc_util_qcom.h
rename to wifi/qcom-flo/wfc_util_qcom.h
diff --git a/wifi/qcom/BoardConfig.mk b/wifi/qcom/BoardConfig.mk
deleted file mode 100644
index a98dee5..0000000
--- a/wifi/qcom/BoardConfig.mk
+++ /dev/null
@@ -1,2 +0,0 @@ 
-BOARD_SEPOLICY_DIRS += $(if $(CONFIG_QCOM_WIFI), \
-	$(LOCAL_PATH)/sepolicy)