From 20def296509899676b8d812032fc0e70ec06541e Mon Sep 17 00:00:00 2001
From: Vyacheslav Pedash <vyacheslav.pedash@globallogic.com>
Date: Fri, 18 Aug 2023 17:48:20 +0300
Subject: MTX-5053 Update RS911x driver to v. 2.6.1

New driver has a fix for WPA2-PSK connections with wpa-supplicant v 2.10 and above.
---
 .../files/0001_concurrent_compilation_fix.patch    | 26 -------
 ...0002-fix-rsi_handle_card_ready-card-ready.patch | 36 ----------
 .../rsi-91x/files/fix-rsi-handle-card-ready.patch  | 23 ++++++
 recipes-kernel/rsi-91x/files/rsi-91x-config.patch  | 16 +++--
 recipes-kernel/rsi-91x/files/rsi-91x-sta-ap.patch  | 16 +++--
 .../rsi-91x/files/rsi-bt91x-config.patch           | 16 +++--
 recipes-kernel/rsi-91x/rsi-91x-fw_2.5.1.bb         | 81 ----------------------
 recipes-kernel/rsi-91x/rsi-91x-fw_2.6.1.bb         | 81 ++++++++++++++++++++++
 recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.5.1.bb     | 39 -----------
 recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.6.1.bb     | 38 ++++++++++
 recipes-kernel/rsi-91x/rsi-91x-utils_2.5.1.bb      | 31 ---------
 recipes-kernel/rsi-91x/rsi-91x-utils_2.6.1.bb      | 31 +++++++++
 recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb            | 36 ----------
 recipes-kernel/rsi-91x/rsi-91x_2.6.1.bb            | 37 ++++++++++
 recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb          | 36 ----------
 recipes-kernel/rsi-91x/rsi-bt91x_2.6.1.bb          | 35 ++++++++++
 16 files changed, 272 insertions(+), 306 deletions(-)
 delete mode 100644 recipes-kernel/rsi-91x/files/0001_concurrent_compilation_fix.patch
 delete mode 100644 recipes-kernel/rsi-91x/files/0002-fix-rsi_handle_card_ready-card-ready.patch
 create mode 100644 recipes-kernel/rsi-91x/files/fix-rsi-handle-card-ready.patch
 delete mode 100644 recipes-kernel/rsi-91x/rsi-91x-fw_2.5.1.bb
 create mode 100644 recipes-kernel/rsi-91x/rsi-91x-fw_2.6.1.bb
 delete mode 100644 recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.5.1.bb
 create mode 100644 recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.6.1.bb
 delete mode 100644 recipes-kernel/rsi-91x/rsi-91x-utils_2.5.1.bb
 create mode 100644 recipes-kernel/rsi-91x/rsi-91x-utils_2.6.1.bb
 delete mode 100644 recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb
 create mode 100644 recipes-kernel/rsi-91x/rsi-91x_2.6.1.bb
 delete mode 100644 recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb
 create mode 100644 recipes-kernel/rsi-91x/rsi-bt91x_2.6.1.bb

diff --git a/recipes-kernel/rsi-91x/files/0001_concurrent_compilation_fix.patch b/recipes-kernel/rsi-91x/files/0001_concurrent_compilation_fix.patch
deleted file mode 100644
index 5615c78..0000000
--- a/recipes-kernel/rsi-91x/files/0001_concurrent_compilation_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-rs9116 rsi-91x linux driver fails to compile in Station + AP mode
-
-Silicon labs patch from case 00297277
-
-https://community.silabs.com/5008Y000024DTst
-==================================================
-diff --git a/rsi_91x_per.c b/rsi_91x_per.c
-index 031f3fc..d57b8fa 100644
---- a/rsi_91x_per.c
-+++ b/rsi_91x_per.c
-@@ -145,7 +145,6 @@ int rsi_send_rx_stats_cmd(struct rsi_hw *adapter, struct nlmsghdr *nlh)
-   int status                        = 0;
- #endif
- 
--  if (common->driver_mode == E2E_MODE) {
- #ifndef CONFIG_STA_PLUS_AP
-     struct ieee80211_vif *vif = adapter->vifs[0];
-     bool assoc                = vif && vif->bss_conf.assoc;
-@@ -154,6 +153,7 @@ int rsi_send_rx_stats_cmd(struct rsi_hw *adapter, struct nlmsghdr *nlh)
-     bool assoc                    = sta_vif && sta_vif->bss_conf.assoc;
- #endif
- 
-+  if (common->driver_mode == E2E_MODE) {
-     if (!assoc && adapter->ps_state == PS_ENABLED)
-       rsi_disable_ps(adapter);
-     goto SEND_STATS_FRAME;
diff --git a/recipes-kernel/rsi-91x/files/0002-fix-rsi_handle_card_ready-card-ready.patch b/recipes-kernel/rsi-91x/files/0002-fix-rsi_handle_card_ready-card-ready.patch
deleted file mode 100644
index aeed2c9..0000000
--- a/recipes-kernel/rsi-91x/files/0002-fix-rsi_handle_card_ready-card-ready.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 822df5990784ba914a1622e81b2b9ea4e079d5ea Mon Sep 17 00:00:00 2001
-From: Serhii Voloshynov <serhii.voloshynov@globallogic.com>
-Date: Thu, 29 Dec 2022 09:36:07 +0200
-Subject: [PATCH] fix 'rsi_handle_card_ready: card ready indication in invalid
- state 0.' issue
-
----
-rsi_91x_hal.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/rsi_91x_hal.c b/rsi_91x_hal.c
-index c3d5823..e3eeec6 100644
---- a/rsi_91x_hal.c
-+++ b/rsi_91x_hal.c
-@@ -1703,6 +1703,9 @@ int rsi_hal_device_init(struct rsi_hw *adapter)
- 
-   rsi_dbg(ERR_ZONE, "%s: oper_mode = %d, coex_mode = %d\n", __func__, common->oper_mode, common->coex_mode);
- 
-+  adapter->common_hal_fsm = COMMAN_HAL_WAIT_FOR_CARD_READY;
-+  common->fsm_state       = FSM_CARD_NOT_READY;
-+
-   switch (adapter->device_model) {
-     case RSI_DEV_9113:
-     case RSI_DEV_9116:
-@@ -1714,8 +1717,6 @@ int rsi_hal_device_init(struct rsi_hw *adapter)
-     default:
-       return -EINVAL;
-   }
--  adapter->common_hal_fsm = COMMAN_HAL_WAIT_FOR_CARD_READY;
--  common->fsm_state       = FSM_CARD_NOT_READY;
- 
- #if defined(CONFIG_RSI_BT_ALONE) || defined(CONFIG_RSI_COEX_MODE)
-   adapter->priv->bt_fsm_state = BT_DEVICE_NOT_READY;
--- 
-2.25.1
-
diff --git a/recipes-kernel/rsi-91x/files/fix-rsi-handle-card-ready.patch b/recipes-kernel/rsi-91x/files/fix-rsi-handle-card-ready.patch
new file mode 100644
index 0000000..aed069a
--- /dev/null
+++ b/recipes-kernel/rsi-91x/files/fix-rsi-handle-card-ready.patch
@@ -0,0 +1,23 @@
+diff --git a/rsi/rsi_91x_hal.c b/rsi/rsi_91x_hal.c
+index b9166f6..a94b871 100644
+--- a/rsi/rsi_91x_hal.c
++++ b/rsi/rsi_91x_hal.c
+@@ -1794,6 +1794,9 @@ int rsi_hal_device_init(struct rsi_hw *adapter)
+ 
+   rsi_dbg(ERR_ZONE, "%s: oper_mode = %d, coex_mode = %d\n", __func__, common->oper_mode, common->coex_mode);
+ 
++  adapter->common_hal_fsm = COMMAN_HAL_WAIT_FOR_CARD_READY;
++  common->fsm_state       = FSM_CARD_NOT_READY;
++
+   switch (adapter->device_model) {
+     case RSI_DEV_9113:
+     case RSI_DEV_9116:
+@@ -1805,8 +1808,6 @@ int rsi_hal_device_init(struct rsi_hw *adapter)
+     default:
+       return -EINVAL;
+   }
+-  adapter->common_hal_fsm = COMMAN_HAL_WAIT_FOR_CARD_READY;
+-  common->fsm_state       = FSM_CARD_NOT_READY;
+ 
+ #if defined(CONFIG_RSI_BT_ALONE) || defined(CONFIG_RSI_COEX_MODE)
+   adapter->priv->bt_fsm_state = BT_DEVICE_NOT_READY;
diff --git a/recipes-kernel/rsi-91x/files/rsi-91x-config.patch b/recipes-kernel/rsi-91x/files/rsi-91x-config.patch
index c711698..448c7b2 100644
--- a/recipes-kernel/rsi-91x/files/rsi-91x-config.patch
+++ b/recipes-kernel/rsi-91x/files/rsi-91x-config.patch
@@ -1,8 +1,8 @@
 diff --git a/rsi/Makefile b/rsi/Makefile
-index 64f7742..e74d971 100644
+index 0c610f8..a7ec0cc 100644
 --- a/rsi/Makefile
 +++ b/rsi/Makefile
-@@ -45,7 +45,7 @@ KERNELDIR=/lib/modules/$(KERNELRELEASE)/build
+@@ -17,7 +17,7 @@ KERNELDIR=/lib/modules/$(KERNELRELEASE)/build
  #CONFIG_RSI_BT_ALONE=y
  
  # Uncomment below line for Wi-Fi BT coex mode
@@ -11,7 +11,7 @@ index 64f7742..e74d971 100644
  
  # Uncomment below line for WLAN + Zigbee coex mode
  #CONFIG_RSI_ZIGB=y
-@@ -196,10 +196,15 @@ rsi_usb-objs := $(COMMON_USB_OBJS)
+@@ -168,13 +168,18 @@ rsi_usb-objs := $(COMMON_USB_OBJS)
  rsi_91x-objs := $(RSI_91X_OBJS)
  
  all:
@@ -19,13 +19,15 @@ index 64f7742..e74d971 100644
 +	env
  	@echo -e "\033[32mCompiling RSI drivers...\033[0m"
  	make -C$(KERNELDIR)/ M=$(PWD) modules
--	@echo -e "application compilation"
+ 	chmod 777 start_rs9116.sh
+ 	chmod 777 osd_common_insert.sh
 -	make CC="$(CC)" ROOT_DIR=$(ROOT_DIR) -C $(PWD)/apps
-+	# @echo -e "application compilation"
 +	# make CC="$(CC)" ROOT_DIR=$(ROOT_DIR) -C $(PWD)/apps
-+
+ 	@echo -e "\033[32mCompilation done SUCCESSFULLY\033[0m"
+ 
 +modules_install:
 +	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
- 
++
  clean:
  	make -C$(KERNELDIR)/ M=$(PWD) clean
+ 	@find . -name 'receive' | xargs rm -rf
diff --git a/recipes-kernel/rsi-91x/files/rsi-91x-sta-ap.patch b/recipes-kernel/rsi-91x/files/rsi-91x-sta-ap.patch
index 73c3e1b..d542ae2 100644
--- a/recipes-kernel/rsi-91x/files/rsi-91x-sta-ap.patch
+++ b/recipes-kernel/rsi-91x/files/rsi-91x-sta-ap.patch
@@ -1,8 +1,8 @@
 diff --git a/rsi/Makefile b/rsi/Makefile
-index 64f7742..951b7a1 100644
+index 0c610f8..ad0caaa 100644
 --- a/rsi/Makefile
 +++ b/rsi/Makefile
-@@ -57,7 +57,7 @@ KERNELDIR=/lib/modules/$(KERNELRELEASE)/build
+@@ -29,7 +29,7 @@ KERNELDIR=/lib/modules/$(KERNELRELEASE)/build
  #CONFIG_RSI_P2P=y
  
  # Uncomment below line for using Concurrent mode
@@ -11,7 +11,7 @@ index 64f7742..951b7a1 100644
  
  # Uncomment below line for platforms with no SDIO multiblock support
  #CONFIG_RSI_NO_SDIO_MULTIBLOCK=y
-@@ -190,16 +190,21 @@ ifeq ($(OFFLOAD_SCAN_TO_DEVICE), y)
+@@ -162,19 +162,24 @@ ifeq ($(OFFLOAD_SCAN_TO_DEVICE), y)
  EXTRA_CFLAGS += -DOFFLOAD_SCAN_TO_DEVICE
  endif
  
@@ -28,13 +28,15 @@ index 64f7742..951b7a1 100644
 +	env
  	@echo -e "\033[32mCompiling RSI drivers...\033[0m"
  	make -C$(KERNELDIR)/ M=$(PWD) modules
--	@echo -e "application compilation"
+ 	chmod 777 start_rs9116.sh
+ 	chmod 777 osd_common_insert.sh
 -	make CC="$(CC)" ROOT_DIR=$(ROOT_DIR) -C $(PWD)/apps
-+	# @echo -e "application compilation"
 +	# make CC="$(CC)" ROOT_DIR=$(ROOT_DIR) -C $(PWD)/apps
-+
+ 	@echo -e "\033[32mCompilation done SUCCESSFULLY\033[0m"
+ 
 +modules_install:
 +	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
- 
++
  clean:
  	make -C$(KERNELDIR)/ M=$(PWD) clean
+ 	@find . -name 'receive' | xargs rm -rf
diff --git a/recipes-kernel/rsi-91x/files/rsi-bt91x-config.patch b/recipes-kernel/rsi-91x/files/rsi-bt91x-config.patch
index 3bda909..3f74f50 100644
--- a/recipes-kernel/rsi-91x/files/rsi-bt91x-config.patch
+++ b/recipes-kernel/rsi-91x/files/rsi-bt91x-config.patch
@@ -1,8 +1,8 @@
 diff --git a/rsi/Makefile b/rsi/Makefile
-index 64f7742..bc088b8 100644
+index 0c610f8..7af43f7 100644
 --- a/rsi/Makefile
 +++ b/rsi/Makefile
-@@ -42,7 +42,7 @@ KERNELDIR=/lib/modules/$(KERNELRELEASE)/build
+@@ -14,7 +14,7 @@ KERNELDIR=/lib/modules/$(KERNELRELEASE)/build
  #CONFIG_SDIO_INTR_POLL=y
  
  # Uncomment below line for BT alone (Classic/LE/Dual) mode
@@ -11,7 +11,7 @@ index 64f7742..bc088b8 100644
  
  # Uncomment below line for Wi-Fi BT coex mode
  #CONFIG_RSI_COEX_MODE=y
-@@ -190,16 +190,21 @@ ifeq ($(OFFLOAD_SCAN_TO_DEVICE), y)
+@@ -162,19 +162,24 @@ ifeq ($(OFFLOAD_SCAN_TO_DEVICE), y)
  EXTRA_CFLAGS += -DOFFLOAD_SCAN_TO_DEVICE
  endif
  
@@ -29,13 +29,15 @@ index 64f7742..bc088b8 100644
 +	env
  	@echo -e "\033[32mCompiling RSI drivers...\033[0m"
  	make -C$(KERNELDIR)/ M=$(PWD) modules
--	@echo -e "application compilation"
+ 	chmod 777 start_rs9116.sh
+ 	chmod 777 osd_common_insert.sh
 -	make CC="$(CC)" ROOT_DIR=$(ROOT_DIR) -C $(PWD)/apps
-+	# @echo -e "application compilation"
 +	# make CC="$(CC)" ROOT_DIR=$(ROOT_DIR) -C $(PWD)/apps
-+
+ 	@echo -e "\033[32mCompilation done SUCCESSFULLY\033[0m"
+ 
 +modules_install:
 +	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
- 
++
  clean:
  	make -C$(KERNELDIR)/ M=$(PWD) clean
+ 	@find . -name 'receive' | xargs rm -rf
diff --git a/recipes-kernel/rsi-91x/rsi-91x-fw_2.5.1.bb b/recipes-kernel/rsi-91x/rsi-91x-fw_2.5.1.bb
deleted file mode 100644
index 19dca25..0000000
--- a/recipes-kernel/rsi-91x/rsi-91x-fw_2.5.1.bb
+++ /dev/null
@@ -1,81 +0,0 @@
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/rsi/Makefile;beginline=1;endline=29;md5=5eb8ffe925477437d8fcd5e2859c96a1"
-LICENSE = "BSD-3-Clause"
-PR = "r3"
-
-inherit allarch
-inherit update-rc.d
-SRCREV = "v${PV}"
-
-SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
-           file://rsi_91x.conf \
-           file://rs9113_load_modules.sh \
-           file://rs9113_remove_modules.sh \
-           file://rs9113.default \
-           file://rs9113.init \
-           file://rs9113.reset \
-           file://rsi_91x.conf \
-	  "
-S = "${WORKDIR}/git/"
-ALLOW_EMPTY_rsi-91x-autostart = "1"
-PACKAGES =+ "rsi-91x-examples rsi-91x-reset rsi-91x-autostart"
-
-FILES_rsi-91x-examples = "/opt/rs9113/examples"
-FILES_rsi-91x-reset = "/etc/init.d/rs9113-reset"
-RDEPENDS_rsi-91x-reset = "bash"
-RDEPENDS_rsi-91x-fw = "bash"
-RDEPENDS_rsi-91x-autostart = "${PN}"
-INITSCRIPT_PACKAGES = "rsi-91x-autostart rsi-91x-reset"
-INITSCRIPT_NAME_rsi-91x-autostart = "rs9113"
-INITSCRIPT_PARAMS_rsi-91x-autostart = "start 50 S ."
-
-INITSCRIPT_NAME_rsi-91x-reset = "rs9113-reset"
-INITSCRIPT_PARAMS_rsi-91x-reset = "start 40 S ."
-
-
-FILES_${PN} = "${base_libdir} ${prefix} /opt ${sysconfdir}"
-
-do_install() {
-    cd ${WORKDIR}
-    instdir="${D}/opt/rs9113"
-    install -m 0755 -d ${instdir}/tables
-    install -m 0755 -d ${D}${prefix}/sbin
-    install -m 0755 rs9113_load_modules.sh ${D}${prefix}/sbin
-    install -m 0755 rs9113_remove_modules.sh ${D}${prefix}/sbin
-    install -m 0755 -d ${D}${sysconfdir}/modprobe.d
-    install -m 0644 rsi_91x.conf ${D}${sysconfdir}/modprobe.d
-    install -m 0644 -d ${D}${sysconfdir}/default
-    install -m 0644 rs9113.default ${D}${sysconfdir}/default/rs9113
-    install -m 0755 -d ${D}${base_libdir}/firmware/
-    install ${S}/Firmware/* ${D}${base_libdir}/firmware
-    install -m 0755 -d ${D}${prefix}/share/${PN}
-    sed -n '1,29p' git/rsi/Makefile >${D}${prefix}/share/${PN}/LICENSE
-    install -m 0755 -d ${D}${sysconfdir}/init.d
-    install -m 0755 rs9113.init ${D}${sysconfdir}/init.d/rs9113
-    install -m 0755 rs9113.reset ${D}${sysconfdir}/init.d/rs9113-reset
-    install -m 0755 -d ${D}/opt/rs9113/tables
-    for f in ${S}/rsi/release/* ; do
-        if file "${f}" | grep ELF ; then
-            # Package from SiliconLabs is contaminated
-            continue
-        fi
-        install ${f}  ${instdir}/tables
-    done
-    install -m 0755 -d ${instdir}/examples
-    cd ${S}/scripts
-    for d in $(find . -type d) ; do
-        install -m 0755 -d "${instdir}/examples/${d}"
-        dest="${instdir}/examples/${d}"
-        (
-            cd "${d}"
-            for f in $(find . -maxdepth 1 -type f) ; do
-                ftype=$(file "$f")
-                if file "${f}" | grep ELF ; then
-                    # Package from SiliconLabs is contaminated
-                    continue
-                fi
-                echo "Installing ${f} into ${instdir}/examples/${d}"
-                install -m 0644 "${f}" "${instdir}/examples/${d}"
-            done
-        )
-    done
-}
diff --git a/recipes-kernel/rsi-91x/rsi-91x-fw_2.6.1.bb b/recipes-kernel/rsi-91x/rsi-91x-fw_2.6.1.bb
new file mode 100644
index 0000000..099600b
--- /dev/null
+++ b/recipes-kernel/rsi-91x/rsi-91x-fw_2.6.1.bb
@@ -0,0 +1,81 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+PR = "r4"
+
+inherit allarch
+inherit update-rc.d
+SRCREV = "v${PV}"
+
+SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
+           file://rsi_91x.conf \
+           file://rs9113_load_modules.sh \
+           file://rs9113_remove_modules.sh \
+           file://rs9113.default \
+           file://rs9113.init \
+           file://rs9113.reset \
+           file://rsi_91x.conf \
+	  "
+S = "${WORKDIR}/git/"
+ALLOW_EMPTY_rsi-91x-autostart = "1"
+PACKAGES =+ "rsi-91x-examples rsi-91x-reset rsi-91x-autostart"
+
+FILES_rsi-91x-examples = "/opt/rs9113/examples"
+FILES_rsi-91x-reset = "/etc/init.d/rs9113-reset"
+RDEPENDS_rsi-91x-reset = "bash"
+RDEPENDS_rsi-91x-fw = "bash"
+RDEPENDS_rsi-91x-autostart = "${PN}"
+INITSCRIPT_PACKAGES = "rsi-91x-autostart rsi-91x-reset"
+INITSCRIPT_NAME_rsi-91x-autostart = "rs9113"
+INITSCRIPT_PARAMS_rsi-91x-autostart = "start 50 S ."
+
+INITSCRIPT_NAME_rsi-91x-reset = "rs9113-reset"
+INITSCRIPT_PARAMS_rsi-91x-reset = "start 40 S ."
+
+
+FILES_${PN} = "${base_libdir} ${prefix} /opt ${sysconfdir}"
+
+do_install() {
+    cd ${WORKDIR}
+    instdir="${D}/opt/rs9113"
+    install -m 0755 -d ${instdir}/tables
+    install -m 0755 -d ${D}${prefix}/sbin
+    install -m 0755 rs9113_load_modules.sh ${D}${prefix}/sbin
+    install -m 0755 rs9113_remove_modules.sh ${D}${prefix}/sbin
+    install -m 0755 -d ${D}${sysconfdir}/modprobe.d
+    install -m 0644 rsi_91x.conf ${D}${sysconfdir}/modprobe.d
+    install -m 0644 -d ${D}${sysconfdir}/default
+    install -m 0644 rs9113.default ${D}${sysconfdir}/default/rs9113
+    install -m 0755 -d ${D}${base_libdir}/firmware/
+    install ${S}/Firmware/* ${D}${base_libdir}/firmware
+    install -m 0755 -d ${D}${prefix}/share/${PN}
+    sed -n '1,29p' git/rsi/Makefile >${D}${prefix}/share/${PN}/LICENSE
+    install -m 0755 -d ${D}${sysconfdir}/init.d
+    install -m 0755 rs9113.init ${D}${sysconfdir}/init.d/rs9113
+    install -m 0755 rs9113.reset ${D}${sysconfdir}/init.d/rs9113-reset
+    install -m 0755 -d ${D}/opt/rs9113/tables
+    for f in ${S}/rsi/release/* ; do
+        if file "${f}" | grep ELF ; then
+            # Package from SiliconLabs is contaminated
+            continue
+        fi
+        install ${f}  ${instdir}/tables
+    done
+    install -m 0755 -d ${instdir}/examples
+    cd ${S}/scripts
+    for d in $(find . -type d) ; do
+        install -m 0755 -d "${instdir}/examples/${d}"
+        dest="${instdir}/examples/${d}"
+        (
+            cd "${d}"
+            for f in $(find . -maxdepth 1 -type f) ; do
+                ftype=$(file "$f")
+                if file "${f}" | grep ELF ; then
+                    # Package from SiliconLabs is contaminated
+                    continue
+                fi
+                echo "Installing ${f} into ${instdir}/examples/${d}"
+                install -m 0644 "${f}" "${instdir}/examples/${d}"
+            done
+        )
+    done
+}
diff --git a/recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.5.1.bb b/recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.5.1.bb
deleted file mode 100644
index 56c2de6..0000000
--- a/recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.5.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-LICENSE = "GPLv2+|BSD"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r1"
-PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
-RPROVIDES_kernel-module-${PN} = "${PN}"
-inherit module
-
-SRCREV = "v${PV}"
-SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
-           file://rsi-91x-sta-ap.patch;striplevel=2 \
-           file://0001_concurrent_compilation_fix.patch \
-           file://0002-fix-rsi_handle_card_ready-card-ready.patch \
-	  "
-S = "${WORKDIR}/git/rsi"
-
-EXTRA_OEMAKE = " KERNELDIR=${STAGING_KERNEL_DIR} \
-                 CROSS_COMPILE=${TARGET_PREFIX} \
-                 ARCH=arm \
-                 WLAN_COMPILE_FLAGS='' \
-                 V=1 \
-                "
-
-PARALLEL_MAKE = ""
-PACKAGES = "kernel-module-${PN} \
-            kernel-module-rsi-usb-sta-ap \
-            ${PN}-dev \
-            ${PN}-dbg \
-"
-INSTDIR = "/opt/rs9113/modules"
-FILES_kernel-module-${PN} = "${INSTDIR}/rsi_91x_sta_ap.ko"
-FILES_kernel-module-rsi-usb-sta-ap = "${INSTDIR}/rsi_usb_sta_ap.ko"
-
-do_install() {
-   instdir="${D}/opt/rs9113/modules"
-   install -m 0755 -d "${instdir}"
-    # use cp instead of install so the driver doesn't get stripped
-    cp ${S}/rsi_91x_sta_ap.ko "${instdir}"
-    cp ${S}/rsi_usb_sta_ap.ko "${instdir}"
-}
diff --git a/recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.6.1.bb b/recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.6.1.bb
new file mode 100644
index 0000000..d2db9a3
--- /dev/null
+++ b/recipes-kernel/rsi-91x/rsi-91x-sta-ap_2.6.1.bb
@@ -0,0 +1,38 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+PR = "r2"
+PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
+RPROVIDES_kernel-module-${PN} = "${PN}"
+inherit module
+
+SRCREV = "v${PV}"
+SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
+           file://rsi-91x-sta-ap.patch;striplevel=2 \
+           file://fix-rsi-handle-card-ready.patch;striplevel=2 \
+	      "
+S = "${WORKDIR}/git/rsi"
+
+EXTRA_OEMAKE = " KERNELDIR=${STAGING_KERNEL_DIR} \
+                 CROSS_COMPILE=${TARGET_PREFIX} \
+                 ARCH=arm \
+                 WLAN_COMPILE_FLAGS='' \
+                 V=1 \
+                "
+
+PARALLEL_MAKE = ""
+PACKAGES = "kernel-module-${PN} \
+            kernel-module-rsi-usb-sta-ap \
+            ${PN}-dev \
+            ${PN}-dbg \
+"
+INSTDIR = "/opt/rs9113/modules"
+FILES_kernel-module-${PN} = "${INSTDIR}/rsi_91x_sta_ap.ko"
+FILES_kernel-module-rsi-usb-sta-ap = "${INSTDIR}/rsi_usb_sta_ap.ko"
+
+do_install() {
+   instdir="${D}/opt/rs9113/modules"
+   install -m 0755 -d "${instdir}"
+    # use cp instead of install so the driver doesn't get stripped
+    cp ${S}/rsi_91x_sta_ap.ko "${instdir}"
+    cp ${S}/rsi_usb_sta_ap.ko "${instdir}"
+}
diff --git a/recipes-kernel/rsi-91x/rsi-91x-utils_2.5.1.bb b/recipes-kernel/rsi-91x/rsi-91x-utils_2.5.1.bb
deleted file mode 100644
index 49cb4d2..0000000
--- a/recipes-kernel/rsi-91x/rsi-91x-utils_2.5.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/rsi/apps/onebox_util.c;beginline=5;endline=17;md5=de9e3b7d092ee142ef090acc79db39c1"
-LICENSE = "CLOSED"
-PR = "r2"
-
-RDEPENDS_${PN} += "bash"
-
-SRCREV = "v${PV}"
-SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
-           file://onebox_util.sh \
-	  "
-S = "${WORKDIR}/git/rsi/apps"
-
-FILES_${PN} = "${base_libdir} ${prefix} /opt"
-TARGET_CC_ARCH += "${LDFLAGS}"
-do_install() {
-    instdir="${D}/opt/rs9113"
-    install -m 0755 -d ${D}${prefix}/share/${PN}
-    sed -n '5,17p' ${S}/onebox_util.c >${D}${prefix}/share/${PN}/LICENSE
-    install -m 0755 -d ${instdir}
-    cd "${S}"
-    for f in $(find . -type f) ; do
-        if file "$f" | grep ELF ; then
-            if [ "$f" = "./onebox_util" ] ; then
-                install -m 0755 $f ${instdir}/onebox_util_rsi
-            else
-                install -m 0755 $f ${instdir}
-            fi
-        fi
-    done
-    install -m 0755 ${WORKDIR}/onebox_util.sh ${instdir}/onebox_util
-}
diff --git a/recipes-kernel/rsi-91x/rsi-91x-utils_2.6.1.bb b/recipes-kernel/rsi-91x/rsi-91x-utils_2.6.1.bb
new file mode 100644
index 0000000..9f5d7ff
--- /dev/null
+++ b/recipes-kernel/rsi-91x/rsi-91x-utils_2.6.1.bb
@@ -0,0 +1,31 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+PR = "r3"
+
+RDEPENDS_${PN} += "bash"
+
+SRCREV = "v${PV}"
+SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
+           file://onebox_util.sh \
+	  "
+S = "${WORKDIR}/git/rsi/apps"
+
+FILES_${PN} = "${base_libdir} ${prefix} /opt"
+TARGET_CC_ARCH += "${LDFLAGS}"
+do_install() {
+    instdir="${D}/opt/rs9113"
+    install -m 0755 -d ${D}${prefix}/share/${PN}
+    sed -n '5,17p' ${S}/onebox_util.c >${D}${prefix}/share/${PN}/LICENSE
+    install -m 0755 -d ${instdir}
+    cd "${S}"
+    for f in $(find . -type f) ; do
+        if file "$f" | grep ELF ; then
+            if [ "$f" = "./onebox_util" ] ; then
+                install -m 0755 $f ${instdir}/onebox_util_rsi
+            else
+                install -m 0755 $f ${instdir}
+            fi
+        fi
+    done
+    install -m 0755 ${WORKDIR}/onebox_util.sh ${instdir}/onebox_util
+}
diff --git a/recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb b/recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb
deleted file mode 100644
index 24e79a1..0000000
--- a/recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-LICENSE = "GPLv2+|BSD"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r2"
-PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
-RPROVIDES_kernel-module-rsi-91x = "rsi-91x"
-inherit module
-
-SRCREV = "v${PV}"
-SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
-           file://rsi-91x-config.patch;striplevel=2 \
-           file://0001_concurrent_compilation_fix.patch \
-           file://0002-fix-rsi_handle_card_ready-card-ready.patch \
-	  "
-S = "${WORKDIR}/git/rsi"
-
-EXTRA_OEMAKE = " KERNELDIR=${STAGING_KERNEL_DIR} \
-                 CROSS_COMPILE=${TARGET_PREFIX} \
-                 ARCH=arm \
-                 WLAN_COMPILE_FLAGS='' \
-                 V=1 \
-                "
-
-PARALLEL_MAKE = ""
-PACKAGES += "kernel-module-rsi-usb kernel-module-rsi-sdio kernel-module-rsi-91x"
-INSTDIR = "/opt/rs9113/modules"
-FILES_kernel-module-rsi-usb = "${INSTDIR}/rsi_usb.ko"
-FILES_kernel-module-rsi-sdio = "${INSTDIR}/rsi_sdio.ko"
-FILES_kernel-module-rsi-91x = "${INSTDIR}/rsi_91x.ko"
-
-do_install() {
-   install -m 0755 -d ${D}${INSTDIR}
-    # use cp instead of install so the driver doesn't get stripped
-    cp ${S}/rsi_sdio.ko ${D}${INSTDIR}
-    cp ${S}/rsi_91x.ko ${D}${INSTDIR}
-    cp ${S}/rsi_usb.ko ${D}${INSTDIR}
-}
diff --git a/recipes-kernel/rsi-91x/rsi-91x_2.6.1.bb b/recipes-kernel/rsi-91x/rsi-91x_2.6.1.bb
new file mode 100644
index 0000000..09c674f
--- /dev/null
+++ b/recipes-kernel/rsi-91x/rsi-91x_2.6.1.bb
@@ -0,0 +1,37 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+PR = "r3"
+PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
+RPROVIDES_kernel-module-rsi-91x = "rsi-91x"
+inherit module
+
+SRCREV = "v${PV}"
+
+SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
+           file://rsi-91x-config.patch;striplevel=2 \
+           file://fix-rsi-handle-card-ready.patch;striplevel=2 \
+          "
+
+S = "${WORKDIR}/git/rsi/"
+
+EXTRA_OEMAKE = " KERNELDIR=${STAGING_KERNEL_DIR} \
+                 CROSS_COMPILE=${TARGET_PREFIX} \
+                 ARCH=arm \
+                 WLAN_COMPILE_FLAGS='' \
+                 V=1 \
+                "
+
+PARALLEL_MAKE = ""
+PACKAGES += "kernel-module-rsi-usb kernel-module-rsi-sdio kernel-module-rsi-91x"
+INSTDIR = "/opt/rs9113/modules"
+FILES_kernel-module-rsi-usb = "${INSTDIR}/rsi_usb.ko"
+FILES_kernel-module-rsi-sdio = "${INSTDIR}/rsi_sdio.ko"
+FILES_kernel-module-rsi-91x = "${INSTDIR}/rsi_91x.ko"
+
+do_install() {
+   install -m 0755 -d ${D}${INSTDIR}
+    # use cp instead of install so the driver doesn't get stripped
+    cp ${S}/rsi_sdio.ko ${D}${INSTDIR}
+    cp ${S}/rsi_91x.ko ${D}${INSTDIR}
+    cp ${S}/rsi_usb.ko ${D}${INSTDIR}
+}
diff --git a/recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb b/recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb
deleted file mode 100644
index d2cdaa9..0000000
--- a/recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-LICENSE = "GPLv2+|BSD"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r2"
-PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
-RPROVIDES_kernel-module-rsi-bt91x = "rsi-bt91x"
-inherit module
-
-SRCREV = "v${PV}"
-SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
-           file://rsi-bt91x-config.patch;striplevel=2 \
-           file://0001_concurrent_compilation_fix.patch \
-           file://0002-fix-rsi_handle_card_ready-card-ready.patch \
-	  "
-S = "${WORKDIR}/git/rsi"
-
-EXTRA_OEMAKE = " KERNELDIR=${STAGING_KERNEL_DIR} \
-                 CROSS_COMPILE=${TARGET_PREFIX} \
-                 ARCH=arm \
-                 WLAN_COMPILE_FLAGS='' \
-                 V=1 \
-                "
-
-PARALLEL_MAKE = ""
-PACKAGES = "kernel-module-rsi-btusb kernel-module-rsi-btsdio kernel-module-rsi-bt91x rsi-bt91x-dev rsi-bt91x-dbg"
-FILES_kernel-module-rsi-btusb = "/opt/rs9113/modules/rsi_btusb.ko"
-FILES_kernel-module-rsi-btsdio = "/opt/rs9113/modules/rsi_btsdio.ko"
-FILES_kernel-module-rsi-bt91x = "/opt/rs9113/modules/rsi_bt91x.ko"
-
-do_install() {
-   instdir="${D}/opt/rs9113/modules"
-   install -m 0755 -d "${instdir}"
-    # use cp instead of install so the driver doesn't get stripped
-    cp ${S}/rsi_btsdio.ko "${instdir}"
-    cp ${S}/rsi_bt91x.ko "${instdir}"
-    cp ${S}/rsi_btusb.ko "${instdir}"
-}
diff --git a/recipes-kernel/rsi-91x/rsi-bt91x_2.6.1.bb b/recipes-kernel/rsi-91x/rsi-bt91x_2.6.1.bb
new file mode 100644
index 0000000..f720b0a
--- /dev/null
+++ b/recipes-kernel/rsi-91x/rsi-bt91x_2.6.1.bb
@@ -0,0 +1,35 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+PR = "r3"
+PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
+RPROVIDES_kernel-module-rsi-bt91x = "rsi-bt91x"
+inherit module
+
+SRCREV = "v${PV}"
+SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \
+           file://rsi-bt91x-config.patch;striplevel=2 \
+           file://fix-rsi-handle-card-ready.patch;striplevel=2 \
+	      "
+S = "${WORKDIR}/git/rsi"
+
+EXTRA_OEMAKE = " KERNELDIR=${STAGING_KERNEL_DIR} \
+                 CROSS_COMPILE=${TARGET_PREFIX} \
+                 ARCH=arm \
+                 WLAN_COMPILE_FLAGS='' \
+                 V=1 \
+                "
+
+PARALLEL_MAKE = ""
+PACKAGES = "kernel-module-rsi-btusb kernel-module-rsi-btsdio kernel-module-rsi-bt91x rsi-bt91x-dev rsi-bt91x-dbg"
+FILES_kernel-module-rsi-btusb = "/opt/rs9113/modules/rsi_btusb.ko"
+FILES_kernel-module-rsi-btsdio = "/opt/rs9113/modules/rsi_btsdio.ko"
+FILES_kernel-module-rsi-bt91x = "/opt/rs9113/modules/rsi_bt91x.ko"
+
+do_install() {
+   instdir="${D}/opt/rs9113/modules"
+   install -m 0755 -d "${instdir}"
+    # use cp instead of install so the driver doesn't get stripped
+    cp ${S}/rsi_btsdio.ko "${instdir}"
+    cp ${S}/rsi_bt91x.ko "${instdir}"
+    cp ${S}/rsi_btusb.ko "${instdir}"
+}
-- 
cgit v1.2.3