Split off seldom used rs9113 driver files

3 files changed, 52 insertions, 33 deletions

diff --git a/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb b/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb
index e611880..0de8d3b 100644
--- a/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb
+++ b/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "USB Driver for Redpine RS9113"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
 PROVIDES = "rs9113-from-src"
-# r1 is the new firmware, 1.6.24.0, so upgrades will work.
-PR = "r3.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "r4.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
 INHIBIT_PACKAGE_STRIP = "1"
 BB_STRICT_CHECKSUM = "0"
 inherit module
diff --git a/recipes-kernel/rs9113/rs9113.inc b/recipes-kernel/rs9113/rs9113.inc
index b632fc2..0ef9277 100644
--- a/recipes-kernel/rs9113/rs9113.inc
+++ b/recipes-kernel/rs9113/rs9113.inc
@@ -1,10 +1,16 @@
 inherit update-rc.d
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# No arch package must be last, since it picks up all files not picked
-# up elsewhere.
-PACKAGES = "kernel-module-${PN} ${PN}-util ${PN}-dbg ${PN}-noarch"
+# utils-extra picks up ELF executables we don't want on most images.
+# misc picks up non-ELF's we don't want on most images.
+# kernel-module-rs9113 picks up the *.ko files.
+# util contains the onebox utility for creating the VAP.
+# noarch contains the init script and configuration for the driver and
+# the firmware file (firmware/*.rps).
+
+PACKAGES = "${PN}-utils-extra ${PN}-misc kernel-module-${PN} ${PN}-util ${PN}-dbg ${PN}-noarch"
 RDEPENDS_${PN}-noarch = "bash"
+RDEPENDS_${PN}-misc = "bash"
 
 DR = "${DL_DIR}/rs9113-ipk"
 FILESEXTRAPATHS_append := "${DR}:"
@@ -69,37 +75,12 @@ python do_fetch_prepend () {
     os.system(ex + ";" + gt + "|" + tar)
 }
 
-FILES_kernel-module-${PN} = "/opt/rs9113/wlan_xauth.ko \
-	/opt/rs9113/wlan_acl.ko \
-	/opt/rs9113/wlan_tkip.ko \
-	/opt/rs9113/wlan_wep.ko \
-	/opt/rs9113/onebox_wlan_gpl.ko \
-	/opt/rs9113/onebox_nongpl.ko \
-	/opt/rs9113/onebox_common_gpl.ko \
-	/opt/rs9113/onebox_wlan_nongpl.ko \
-	/opt/rs9113/wlan_ccmp.ko \
-	/opt/rs9113/wlan_aes_cmac.ko \
-	/opt/rs9113/onebox_bt_nongpl.ko \
-	/opt/rs9113/onebox_bt_gpl.ko \
-	/opt/rs9113/wlan_scan_sta.ko \
-	/opt/rs9113/onebox_gpl.ko \
-	/opt/rs9113/wlan.ko \
+FILES_kernel-module-${PN} = " \
+	/opt/rs9113/*.ko \
 	"
 
 FILES_${PN}-util = "/opt/rs9113/transmit \
-	/opt/rs9113/transmit_packet \
-	/opt/rs9113/bt_bbp_utils \
-	/opt/rs9113/bbp_util \
-	/opt/rs9113/zb_bbp_util \
-	/opt/rs9113/bt_util \
-	/opt/rs9113/zb_transmit \
-	/opt/rs9113/receive \
 	/opt/rs9113/onebox_util \
-	/opt/rs9113/zb_util \
-	/opt/rs9113/bt_transmit \
-	/opt/rs9113/bt_receive \
-	/opt/rs9113/sniffer_app \
-	/opt/rs9113/START_RS9116_NBZ_D0N \
 	"
 
 FILES_${PN}-dbg = "/opt/rs9113/.debug/bt_bbp_utils \
@@ -118,6 +99,45 @@ FILES_${PN}-dbg = "/opt/rs9113/.debug/bt_bbp_utils \
 	/opt/rs9113/.debug/bt_receive \
 	"
 
+# pmemdata is for upgrading rs9113 non-volatile firmware
+# *.rpm are firmware files for various modes of
+# rs9113 or rs9116 operation.  MODE_PER is for
+# certification testing.
+FILES_${PN}-utils-extra = " \
+	/opt/rs9113/zb* \
+	/opt/rs9113/bt_transmit \
+	/opt/rs9113/zb_transmit \
+	/opt/rs9113/transmit \
+	/opt/rs9113/transmit_packet \
+	/opt/rs9113/bt_receive \
+	/opt/rs9113/receive \
+	/opt/rs9113/zb_util \
+	/opt/rs9113/bt_util \
+	/opt/rs9113/bbp_util \
+	/opt/rs9113/zb_bbp_util \
+	/opt/rs9113/bt_receive \
+	/opt/rs9113/bt_bbp_utils \
+	/opt/rs9113/sniffer_app \
+	/opt/rs9113/START_RS9116_NBZ_D0N \
+	"
+
+FILES_${PN}-misc = " \
+	/opt/rs9113/firmware/RS9113_WLAN_BT_DUAL_MODE_PER.rps \
+	/opt/rs9113/firmware/RS9113_ZIGBEE_ROUTER.rps \
+	/opt/rs9113/firmware/RS9113_ZIGBEE_COORDINATOR.rps \
+	/opt/rs9113/firmware/RS9113_WLAN_ZIGBEE.rps \
+	/opt/rs9113/firmware/pmemdata* \
+	/opt/rs9113/firmware/flash_content \
+	/opt/rs9113/*RS9116* \
+	/opt/rs9113/*.orig \
+	/opt/rs9113/*.txt \
+	/opt/rs9113/*.sh \
+	/opt/rs9113/*.conf \
+	/opt/rs9113/p2pcommands.pl \
+	/opt/rs9113/*reg \
+	/opt/rs9113/afe_spi \
+	"
+
 CONFFILES_${PN}-noarch = "${sysconfdir}/default/"
 FILES_${PN}-noarch = "/opt/rs9113/ ${sysconfdir}/init.d/ ${sysconfdir}/default/ ${prefix}/"
 
diff --git a/recipes-kernel/rs9113/rs9113_1.6.1.bb b/recipes-kernel/rs9113/rs9113_1.6.1.bb
index ab48487..2bf98c5 100644
--- a/recipes-kernel/rs9113/rs9113_1.6.1.bb
+++ b/recipes-kernel/rs9113/rs9113_1.6.1.bb
@@ -15,7 +15,7 @@ RDEPENDS_${PN} += "bash"
 #     git://git@${MTS_INTERNAL_GIT}/mlinux/ipk.git;protocol=ssh;branch=${PV}
 #
 # r1 is the new firmware, 1.6.24.0, so upgrades will work.
-PR = "r3.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "r4.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
 SRC_URI = " \
     file://rs9113/rs9113.init \
     file://rs9113/rs9113.default \