From patchwork Thu Apr 27 22:23:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 98299 Delivered-To: patches@linaro.org Received: by 10.140.109.52 with SMTP id k49csp317231qgf; Thu, 27 Apr 2017 15:23:45 -0700 (PDT) X-Received: by 10.99.147.67 with SMTP id w3mr8360345pgm.145.1493331825705; Thu, 27 Apr 2017 15:23:45 -0700 (PDT) Return-Path: Received: from mail-pf0-x22d.google.com (mail-pf0-x22d.google.com. [2607:f8b0:400e:c00::22d]) by mx.google.com with ESMTPS id h15si4233873plk.313.2017.04.27.15.23.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Apr 2017 15:23:45 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::22d as permitted sender) client-ip=2607:f8b0:400e:c00::22d; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::22d as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x22d.google.com with SMTP id v14so39304898pfd.2 for ; Thu, 27 Apr 2017 15:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=3w8qcFReBufSD6Bubap0KqGtczk4ctgfHk0OPxftFTE=; b=JVc2RiatWm4nyRvRXY115+AnCZQ/Oh1XuMuZ8JVTjWFRlOKjZROKDJOAzGA1B4COSw rkKipiaBYz+l39a6gR9347dmbGtD1PXU3IYjKMNXQ0yPybEUwreCqZWdCbkINZvm61Uc SPJKEjXXYERYC/hIKybt8UdlP3eJmIhpSfo6A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3w8qcFReBufSD6Bubap0KqGtczk4ctgfHk0OPxftFTE=; b=hRjvKwHPZBT7XytTE4ICiRiYTNsK/kNZIXr4yxq5qDlcPisVmqEvk73Y4dRG+uZ0hN mJUvjl807nrzmDmixVFAj/mY11z0XmNKQsdtBkaLhihXGo93gL1o60AeVW449kMoLmcI tRkY7WThx0CtWwLFOuE73XRJ4XQlU9k7qGaBm1dnrYVPOpJVMFmFAMXLYOly0ShYfX4d YBSpC3JNFLLmrs696yYWMZ2kciDI2loGA4sMCBempMo52KJcKFKe82eRnMzfWHVFn3va iHJuGVb1TLGnYPFf7nopia2OGGP8Q3TjiK3VapqMBOfz68FkpuxlWr0JC4BGWFOHGSRR ERLw== X-Gm-Message-State: AN3rC/6kbefKPtM29RumQO4Jjrgo+OtmT2sCqnJcfpVQAggDEmn414Ta SeaKsOCekOSZtSs0PPI= X-Received: by 10.84.224.198 with SMTP id k6mr10416387pln.15.1493331825254; Thu, 27 Apr 2017 15:23:45 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f62sm5941622pfb.84.2017.04.27.15.23.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Apr 2017 15:23:44 -0700 (PDT) From: John Stultz To: Cc: John Stultz , Rob Herring , Sumit Semwal , Vishal Bhoj , Amit Pundir Subject: [PATCH 1/3] wifi: Switch wifi/qcom for wifi/qcom-flo Date: Thu, 27 Apr 2017 15:23:38 -0700 Message-Id: <1493331820-20072-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 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 Cc: Sumit Semwal Cc: Vishal Bhoj Cc: Amit Pundir Signed-off-by: John Stultz --- 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 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)