From c471a35ce20b540a3940372bf1e9b58692735ffe Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Wed, 29 Mar 2023 10:07:03 +0000
Subject: [PATCH 1/2] Fix RTL8821CS-firmware correctly and re-apply to RK3588.

---
 .../kernel/linux-firmware/RTL8821CS-firmware/package.mk     | 6 +++---
 projects/Rockchip/devices/RK3588/options                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk b/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk
index 01a5db66d..2a6a1481e 100644
--- a/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk
+++ b/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk
@@ -16,10 +16,10 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin
-  cp -v $(get_build_dir linux)/wifibt/rtk_hciattach ${INSTALL}/usr/bin
+  cp -v ${PKG_DIR}/firmware/rtk_hciattach ${INSTALL}/usr/bin
   mkdir -p ${INSTALL}/$(get_full_firmware_dir) ||:
-  cp -v $(get_build_dir linux)/wifibt/rtl8821c_fw ${INSTALL}/$(get_full_firmware_dir)
-  cp -v $(get_build_dir linux)/wifibt/rtl8821cs_config ${INSTALL}/$(get_full_firmware_dir)/rtl8821c_config
+  cp -v ${PKG_DIR}/firmware/rtl8821c_fw ${INSTALL}/$(get_full_firmware_dir)
+  cp -v ${PKG_DIR}/firmware/rtl8821cs_config ${INSTALL}/$(get_full_firmware_dir)/rtl8821c_config
 }
 
 post_install() {
diff --git a/projects/Rockchip/devices/RK3588/options b/projects/Rockchip/devices/RK3588/options
index e412747b7..106aaf11d 100755
--- a/projects/Rockchip/devices/RK3588/options
+++ b/projects/Rockchip/devices/RK3588/options
@@ -81,7 +81,7 @@
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-    FIRMWARE="misc-firmware wlan-firmware libmali_rk3588"
+    FIRMWARE="misc-firmware wlan-firmware libmali_rk3588 RTL8821CS-firmware"
 
   # additional drivers to install:
   # for a list of additional drivers see packages/linux-drivers

From a667525536ac0147ab9e458349edb93b07790127 Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Thu, 30 Mar 2023 10:11:49 +0000
Subject: [PATCH 2/2] Bump RK3566 kernel to add support for Anbernic's v2
 devices - thanks to @dexwerks, @macromorgan, and @retrogfx.

---
 projects/Rockchip/packages/linux/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/Rockchip/packages/linux/package.mk b/projects/Rockchip/packages/linux/package.mk
index 0265c79e1..d06b2cdc1 100644
--- a/projects/Rockchip/packages/linux/package.mk
+++ b/projects/Rockchip/packages/linux/package.mk
@@ -26,7 +26,7 @@ case ${DEVICE} in
   ;;
   RK3566)
     PKG_URL="${PKG_SITE}/rk356x-kernel.git"
-    PKG_VERSION="9e2bb8a85"
+    PKG_VERSION="2a846969b"
     GET_HANDLER_SUPPORT="git"
     PKG_GIT_CLONE_BRANCH="main"
   ;;