Move quantenna-kmsgd to vendor/quantenna/drivers.
Change-Id: I7f131a0fed9c253afaa84685d707d78205507aa8
diff --git a/configs/gfrg200_defconfig b/configs/gfrg200_defconfig
index c1da65d..2aaf9af 100644
--- a/configs/gfrg200_defconfig
+++ b/configs/gfrg200_defconfig
@@ -100,7 +100,6 @@
BR2_PACKAGE_GOOGLE_PLATFORM_WAVEGUIDE=y
BR2_PACKAGE_GOOGLE_PLATFORM_LOGUPLOAD=y
BR2_PACKAGE_GOOGLE_PLATFORM_SYSMGR=y
-BR2_PACKAGE_GOOGLE_PLATFORM_QUANTENNA=y
BR2_PACKAGE_GOOGLE_TEST=y
BR2_PACKAGE_GOOGLE_NETWORK_BOX=y
BR2_PACKAGE_GOOGLE_STORAGE_BOX=y
diff --git a/configs/gftv254_defconfig b/configs/gftv254_defconfig
index 382a9bc..ef0d9cb 100644
--- a/configs/gftv254_defconfig
+++ b/configs/gftv254_defconfig
@@ -71,7 +71,6 @@
BR2_PACKAGE_GOOGLE_PLATFORM_HNVRAM=y
BR2_PACKAGE_GOOGLE_PLATFORM_LOGUPLOAD=y
BR2_PACKAGE_GOOGLE_PLATFORM_SYSMGR=y
-BR2_PACKAGE_GOOGLE_PLATFORM_QUANTENNA=y
BR2_PACKAGE_GOOGLE_TEST=y
BR2_PACKAGE_GOOGLE_TV_BOX=y
BR2_PACKAGE_CATAWAMPUS=y
diff --git a/package/google/google_platform/Config.in b/package/google/google_platform/Config.in
index 9caa301..93f35e4 100644
--- a/package/google/google_platform/Config.in
+++ b/package/google/google_platform/Config.in
@@ -61,12 +61,6 @@
help
System manager.
-config BR2_PACKAGE_GOOGLE_PLATFORM_QUANTENNA
- bool "include Quantenna support"
- default n
- help
- Quantenna support.
-
config BR2_PACKAGE_GOOGLE_PLATFORM_JSONPOLL
bool "include jsonpoll tool"
help
diff --git a/package/google/google_platform/google_platform.mk b/package/google/google_platform/google_platform.mk
index 7d3bb2e..5c42e5f 100644
--- a/package/google/google_platform/google_platform.mk
+++ b/package/google/google_platform/google_platform.mk
@@ -106,10 +106,6 @@
BUILD_CRYPTDEV=y
endif
-ifeq ($(BR2_PACKAGE_GOOGLE_PLATFORM_QUANTENNA),y)
-BUILD_QUANTENNA=y
-endif
-
ifeq ($(BR2_PACKAGE_GOOGLE_PLATFORM_JSONPOLL),y)
BUILD_JSONPOLL=y
endif
@@ -173,7 +169,6 @@
BUILD_SIGNING=y \
BUILD_WIFIUTILS=$(BUILD_WIFIUTILS) \
BUILD_SPEEDTEST=$(BUILD_SPEEDTEST) \
- BUILD_QUANTENNA=$(BUILD_QUANTENNA) \
BUILD_JSONPOLL=$(BUILD_JSONPOLL) \
BUILD_CONMAN=$(BUILD_CONMAN)
diff --git a/package/quantenna_drivers/quantenna_drivers.mk b/package/quantenna_drivers/quantenna_drivers.mk
index f47c151..c127f05 100644
--- a/package/quantenna_drivers/quantenna_drivers.mk
+++ b/package/quantenna_drivers/quantenna_drivers.mk
@@ -4,11 +4,13 @@
ifeq ($(BR2_PACKAGE_QUANTENNA_DRIVERS_PCIE_HOST),y)
define QUANTENNA_DRIVERS_BUILD_CMDS
+ $(MAKE) -C $(@D)/quantenna-kmsgd CC="$(TARGET_CC)" quantenna-kmsgd
$(MAKE) -C $(@D)/libqcsapi_client CC="$(TARGET_CC)"
endef
define QUANTENNA_DRIVERS_INSTALL_TARGET_CMDS
cp -a $(@D)/topaz-linux.lzma.img $(TARGET_DIR)/lib/firmware
+ cp -a $(@D)/quantenna-kmsgd/quantenna-kmsgd $(TARGET_DIR)/usr/bin
cp -a $(@D)/libqcsapi_client/qcsapi_pcie_static $(TARGET_DIR)/usr/bin
endef
