diff --git a/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch b/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi.patch
similarity index 100%
rename from package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch
rename to package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi.patch
diff --git a/package/boot/uboot-rockchip/patches/316-rockchip-rk3566-Add-support-for-panther-x2.patch b/package/boot/uboot-rockchip/patches/316-rockchip-rk3566-Add-support-for-panther-x2.patch
index 668ebfc76..5c0f80d45 100644
--- a/package/boot/uboot-rockchip/patches/316-rockchip-rk3566-Add-support-for-panther-x2.patch
+++ b/package/boot/uboot-rockchip/patches/316-rockchip-rk3566-Add-support-for-panther-x2.patch
@@ -11,7 +11,7 @@
 +CONFIG_NR_DRAM_BANKS=2
 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000
-+CONFIG_DEFAULT_DEVICE_TREE="rk3568-evb"
++CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3568-evb1-v10"
 +CONFIG_ROCKCHIP_RK3568=y
 +CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
 +CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
@@ -27,7 +27,7 @@
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
-+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-evb.dtb"
++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-panther-x2.dtb"
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
 +CONFIG_SPL_MAX_SIZE=0x40000
diff --git a/package/boot/uboot-rockchip/patches/326-rockchip-rk3588s-Add-FriendlyElec-NanoPi-R3S.patch b/package/boot/uboot-rockchip/patches/317-rockchip-rk3566-Add-FriendlyARM-NanoPi-R3S.patch
similarity index 94%
rename from package/boot/uboot-rockchip/patches/326-rockchip-rk3588s-Add-FriendlyElec-NanoPi-R3S.patch
rename to package/boot/uboot-rockchip/patches/317-rockchip-rk3566-Add-FriendlyARM-NanoPi-R3S.patch
index 90b04dc56..0dce1df54 100644
--- a/package/boot/uboot-rockchip/patches/326-rockchip-rk3588s-Add-FriendlyElec-NanoPi-R3S.patch
+++ b/package/boot/uboot-rockchip/patches/317-rockchip-rk3566-Add-FriendlyARM-NanoPi-R3S.patch
@@ -8,16 +8,15 @@
 +
 +/ {
 +	model = "FriendlyElec NanoPi R3S";
-+	compatible = "friendlyelec,nanopi-r3s", "rockchip,rk3568";
++	compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3568";
 +};
 --- /dev/null
 +++ b/configs/nanopi-r3s-rk3566_defconfig
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,84 @@
 +CONFIG_ARM=y
 +CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_COUNTER_FREQUENCY=24000000
 +CONFIG_ARCH_ROCKCHIP=y
-+CONFIG_TEXT_BASE=0x00a00000
 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
 +CONFIG_NR_DRAM_BANKS=2
@@ -30,8 +29,11 @@
 +CONFIG_SPL_MMC=y
 +CONFIG_SPL_SERIAL=y
 +CONFIG_SPL_STACK_R_ADDR=0x600000
-+CONFIG_TARGET_EVB_RK3568=y
 +CONFIG_SPL_STACK=0x400000
++CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
++CONFIG_SPL_BSS_START_ADDR=0x4000000
++CONFIG_SPL_BSS_MAX_SIZE=0x4000
++CONFIG_SPL_STACK_R=y
 +CONFIG_DEBUG_UART_BASE=0xFE660000
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_SYS_LOAD_ADDR=0xc00800
@@ -44,20 +46,16 @@
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
 +CONFIG_SPL_MAX_SIZE=0x40000
 +CONFIG_SPL_PAD_TO=0x7f8000
-+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-+CONFIG_SPL_BSS_START_ADDR=0x4000000
-+CONFIG_SPL_BSS_MAX_SIZE=0x4000
 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
-+CONFIG_SPL_STACK_R=y
 +CONFIG_SPL_ATF=y
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_GPT=y
 +CONFIG_CMD_I2C=y
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_USB=y
-+CONFIG_CMD_REGULATOR=y
 +# CONFIG_CMD_SETEXPR is not set
++CONFIG_CMD_REGULATOR=y
 +# CONFIG_SPL_DOS_PARTITION is not set
 +CONFIG_SPL_OF_CONTROL=y
 +CONFIG_OF_LIVE=y
@@ -66,7 +64,6 @@
 +CONFIG_SPL_SYSCON=y
 +CONFIG_SPL_CLK=y
 +CONFIG_CLK_SCMI=y
-+CONFIG_RESET_SCMI=y
 +CONFIG_ROCKCHIP_GPIO=y
 +CONFIG_SYS_I2C_ROCKCHIP=y
 +CONFIG_MISC=y
@@ -78,16 +75,16 @@
 +CONFIG_MMC_SDHCI_ROCKCHIP=y
 +CONFIG_ETH_DESIGNWARE=y
 +CONFIG_GMAC_ROCKCHIP=y
++CONFIG_PHY_ROCKCHIP_INNO_USB2=y
++CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
 +CONFIG_DM_PMIC=y
 +CONFIG_PMIC_RK8XX=y
 +CONFIG_SPL_PMIC_RK8XX=y
-+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
 +CONFIG_REGULATOR_PWM=y
 +CONFIG_REGULATOR_RK8XX=y
 +CONFIG_PWM_ROCKCHIP=y
 +CONFIG_SPL_RAM=y
-+CONFIG_DM_RESET=y
++CONFIG_RESET_SCMI=y
 +CONFIG_BAUDRATE=1500000
 +CONFIG_DEBUG_UART_SHIFT=2
 +CONFIG_SYS_NS16550_MEM32=y
diff --git a/target/linux/rockchip/armv8/config-6.6 b/target/linux/rockchip/armv8/config-6.6
index 24fe01cbc..6bb5d3186 100644
--- a/target/linux/rockchip/armv8/config-6.6
+++ b/target/linux/rockchip/armv8/config-6.6
@@ -658,7 +658,6 @@ CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_STACKTRACE=y
-# CONFIG_STAGING is not set
 CONFIG_STMMAC_ETH=y
 CONFIG_STMMAC_PLATFORM=y
 CONFIG_STRICT_DEVMEM=y