[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  Update README.md
  rockchip:fix nanopi-r4s mac address again
  Version update to R22.9.1
  update README.md
  rockchip: add support for FastRhino R66S/R68S
  rockchip: add basic support for HINLINK OPC-H68K
  rockchip: add support for EZPRO Mrkaio M68S
  rockchip: backport support for Radxa ROCK3 A
  uboot-rockchip: don't hardcore USB_OHCI_NEW options
  rockchip: 5.15: fixes motorcomm driver build error
  rockchip: 5.15: introduce rk3568 support
  rockchip: revert to origin defaults
  Revert "rockchip: backport rk3568 support to kernel 5.10"
  x86: add new missing symbol
  kernel: bump 5.19 to 5.19.6
  rockchip: backport rk3568 support to kernel 5.10 (coolsnowwolf#10025)
  linux-firmware: fix Intel GUC firmware support for N5105/N6005 (coolsnowwolf#10027)

Author: github-actions[bot]

README.md

@@ -127,13 +127,23 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ## 软路由介绍
 
-友情推荐不恰饭：如果你在寻找一个低功耗小体积性能不错的 x86 / x64 路由器，我个人建议可以考虑小马v1 的铝合金版本
-(N3710 4千兆)：[页面介绍](https://item.taobao.com/item.htm?spm=a230r.1.14.20.144c763fRkK0VZ&id=561126544764)
+iKOOLCORE 硬酷R1 多网口小主机 - N5105/N6005 : Cube box, rest fun. 方寸之间，尽是乐趣
 
-![xm1](doc/xm5.jpg) ![xm2](doc/xm6.jpg)
+(商品介绍页面 - 深圳市硬酷科技)：
+[Lean用户R1专属券](https://taoquan.taobao.com/coupon/unify_apply.htm?sellerId=1981117776&activityId=3eb8a2ad3c8945ed831b203f44dc218b)
+[N5105下单链接](https://item.taobao.com/item.htm?ft=t&id=682987219699)
+[N6005下单链接](https://item.taobao.com/item.htm?ft=t&id=682672722483)  
+
+(商品介绍页面 - 硬酷科技（支持花呗）)：
+[Lean用户R1专属券](https://taoquan.taobao.com/coupon/unify_apply.htm?sellerId=2208215115814&activityId=e013790422b849edb3a71e4e6aa46ff3)
+[下单链接](https://item.taobao.com/item.htm?ft=t&id=682987219699)
+
+[![r1](doc/r1.jpg)](https://item.taobao.com/item.htm?ft=t&id=682025492099)
 
 ## 捐贈
 
 如果你觉得此项目对你有帮助，可以捐助我们，以鼓励项目能持续发展，更加完善
 
-支付宝 ![alipay](doc/alipay_donate.jpg) 微信 ![wechat](doc/wechat_donate.jpg)
+  **支付宝**                       **微信**  
+
+![alipay](doc/alipay_donate.jpg)   ![wechat](doc/wechat_donate.jpg)

doc/r1.jpg

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.19 = .5
-LINUX_KERNEL_HASH-5.19.5 = 8c3f1cc4f93e50056bb0a8c15a41a8eb6acc7fd71bff6de60b1ef8c4532537bd
+LINUX_VERSION-5.19 = .6
+LINUX_KERNEL_HASH-5.19.6 = 41a4f824af614460c429a7c723e8dcbb0e042f0047d328c18b4ed6f2b4efa63a

doc/xm5.jpg

@@ -1,6 +1,6 @@
 #
 # This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information. 
+# See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -69,36 +69,14 @@ define U-Boot/orangepi-r1-plus-lts-rk3328
   USE_RKBIN:=1
 endef
 
-define U-Boot/doornet1-rk3328
-  BUILD_SUBTARGET:=armv8
-  NAME:=DoorNet1
-  BUILD_DEVICES:= \
-    embedfire_doornet1
-  DEPENDS:=+PACKAGE_u-boot-doornet1-rk3328:arm-trusted-firmware-rk3328
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk322xh_bl31_v1.49.elf
-  USE_RKBIN:=1
-endef
 
 # RK3399 boards
 
-define U-Boot/doornet2-rk3399
-  BUILD_SUBTARGET:=armv8
-  NAME:=DoorNet2
-  BUILD_DEVICES:= \
-    embedfire_doornet2
-  DEPENDS:=+PACKAGE_u-boot-doornet2-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3399_bl31_v1.35.elf
-  USE_RKBIN:=1
-endef
-
 define U-Boot/guangmiao-g4c-rk3399
   BUILD_SUBTARGET:=armv8
   NAME:=GuangMiao G4C
   BUILD_DEVICES:= \
-    sharevdi_guangmiao-g4c \
-    embedfire_doornet2-4gb
+    sharevdi_guangmiao-g4c
   DEPENDS:=+PACKAGE_u-boot-guangmiao-g4c-rk3399:arm-trusted-firmware-rockchip
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
   ATF:=rk3399_bl31.elf
@@ -126,42 +104,65 @@ define U-Boot/nanopi-r4se-rk3399
   USE_RKBIN:=1
 endef
 
-define U-Boot/opc-h68k-rk3568
+define U-Boot/nanopi-r5s-rk3568
   BUILD_SUBTARGET:=armv8
-  NAME:=HINLINK OPC-H68K
+  NAME:=NanoPi R5S
   BUILD_DEVICES:= \
-    hinlink_opc-h68k-d
-  DEPENDS:=+PACKAGE_u-boot-opc-h68k-rk3568:arm-trusted-firmware-rk3568
+    friendlyarm_nanopi-r5s
+  DEPENDS:=+PACKAGE_u-boot-nanopi-r5s-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.28.elf
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
 endef
 
-define U-Boot/fastrhino-r66s-rk3568
+define U-Boot/rock-pi-4-rk3399
   BUILD_SUBTARGET:=armv8
-  NAME:=FastRhin-R66S
+  NAME:=Rock Pi 4
   BUILD_DEVICES:= \
-    fastrhino_r66s
-  DEPENDS:=+PACKAGE_u-boot-fastrhino-r66s-rk3568:arm-trusted-firmware-rk3568
+    radxa_rock-pi-4
+  DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip
+  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
+  ATF:=rk3399_bl31.elf
+endef
+
+define U-Boot/rockpro64-rk3399
+  BUILD_SUBTARGET:=armv8
+  NAME:=RockPro64
+  BUILD_DEVICES:= \
+    pine64_rockpro64
+  DEPENDS:=+PACKAGE_u-boot-rockpro64-rk3399:arm-trusted-firmware-rockchip
+  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
+  ATF:=rk3399_bl31.elf
+endef
+
+
+# RK3568 boards
+
+define U-Boot/mrkaio-m68s-rk3568
+  BUILD_SUBTARGET:=armv8
+  NAME:=Mrkaio M68S
+  BUILD_DEVICES:= \
+    ezpro_mrkaio-m68s
+  DEPENDS:=+PACKAGE_u-boot-mrkaio-m68s-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.28.elf
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
 endef
 
-define U-Boot/nanopi-r5s-rk3568
+define U-Boot/opc-h68k-rk3568
   BUILD_SUBTARGET:=armv8
-  NAME:=NANOPI-R5S
+  NAME:=OPC-H68K Board
   BUILD_DEVICES:= \
-    friendlyelec_nanopi-r5s
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r5s-rk3568:arm-trusted-firmware-rk3568
+    hinlink_opc-h68k
+  DEPENDS:=+PACKAGE_u-boot-opc-h68k-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.28.elf
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
 endef
 
 define U-Boot/rock-3a-rk3568
   BUILD_SUBTARGET:=armv8
-  NAME:=ROCK-3A
+  NAME:=ROCK3 Model A
   BUILD_DEVICES:= \
     radxa_rock-3a
   DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
@@ -170,54 +171,33 @@ define U-Boot/rock-3a-rk3568
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
 endef
 
-define U-Boot/rock-pi-4-rk3399
+define U-Boot/r66s-rk3568
   BUILD_SUBTARGET:=armv8
-  NAME:=Rock Pi 4
+  NAME:=R66S/R68S
   BUILD_DEVICES:= \
-    radxa_rock-pi-4
-  DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
-  ATF:=rk3399_bl31.elf
-endef
-
-define U-Boot/rockpro64-rk3399
-  BUILD_SUBTARGET:=armv8
-  NAME:=RockPro64
-  BUILD_DEVICES:= \
-    pine64_rockpro64
-  DEPENDS:=+PACKAGE_u-boot-rockpro64-rk3399:arm-trusted-firmware-rockchip
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
-  ATF:=rk3399_bl31.elf
-endef
-
-define U-Boot/station-p2-rk3568
-  BUILD_SUBTARGET:=armv8
-  NAME:=StationP2
-  BUILD_DEVICES:= \
-       firefly_station-p2
-  DEPENDS:=+PACKAGE_u-boot-station-p2-rk3568:arm-trusted-firmware-rk3568
+    fastrhino_r66s \
+    fastrhino_r68s
+  DEPENDS:=+PACKAGE_u-boot-r66s-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.28.elf
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
 endef
 
 UBOOT_TARGETS := \
-  doornet2-rk3399 \
-  fastrhino-r66s-rk3568 \
+  mrkaio-m68s-rk3568 \
+  opc-h68k-rk3568 \
+  rock-3a-rk3568 \
+  r66s-rk3568 \
   guangmiao-g4c-rk3399 \
   nanopi-r4s-rk3399 \
   nanopi-r4se-rk3399 \
   nanopi-r5s-rk3568 \
-  rock-3a-rk3568 \
   rock-pi-4-rk3399 \
   rockpro64-rk3399 \
-  doornet1-rk3328 \
   nanopi-r2c-rk3328 \
   nanopi-r2s-rk3328 \
   orangepi-r1-plus-rk3328 \
-  orangepi-r1-plus-lts-rk3328 \
-  opc-h68k-rk3568 \
-  station-p2-rk3568
+  orangepi-r1-plus-lts-rk3328
 
 UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
 

doc/xm6.jpg

@@ -17,9 +17,6 @@ Signed-off-by: Marty Jones <[email protected]>
  9 files changed, 692 insertions(+), 1 deletion(-)
  create mode 100644 arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
  create mode 100644 arch/arm/dts/rk3568-rock-3a.dts
- create mode 100644 board/radxa/rock-3a-rk3568/Kconfig
- create mode 100644 board/radxa/rock-3a-rk3568/Makefile
- create mode 100644 board/radxa/rock-3a-rk3568/rock-3a-rk3568.c
  create mode 100644 configs/rock-3a-rk3568_defconfig
  create mode 100644 include/configs/rock-3a-rk3568.h
 
@@ -37,7 +34,7 @@ Signed-off-by: Marty Jones <[email protected]>
  	rv1108-elgin-r1.dtb \
 --- /dev/null
 +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,24 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * (C) Copyright 2021 Rockchip Electronics Co., Ltd
@@ -54,13 +51,12 @@ Signed-off-by: Marty Jones <[email protected]>
 +
 +&sdmmc0 {
 +	bus-width = <4>;
-+	u-boot,dm-spl;
 +	u-boot,spl-fifo-mode;
 +};
 +
 +&uart2 {
-+	clock-frequency = <24000000>;
 +	u-boot,dm-spl;
++	clock-frequency = <24000000>;
 +	status = "okay";
 +};
 --- /dev/null
@@ -591,59 +587,9 @@ Signed-off-by: Marty Jones <[email protected]>
 +&usb_host1_ohci {
 +	status = "okay";
 +};
---- a/arch/arm/mach-rockchip/rk3568/Kconfig
-+++ b/arch/arm/mach-rockchip/rk3568/Kconfig
-@@ -18,6 +18,11 @@ config TARGET_QUARTZ64_A_RK3566
- 	help
- 	  Quartz64 Model A RK3566 is a development board from Pine64.
- 
-+config TARGET_ROCK_3A_RK3568
-+	bool "ROCK3 Model A RK3568 development board"
-+	help
-+	  ROCK3 Model A RK3568 is a development board from Radxa.
-+
- endchoice
- 
- config ROCKCHIP_BOOT_MODE_REG
-@@ -35,5 +40,6 @@ config SYS_MALLOC_F_LEN
- source "board/rockchip/bpi-r2-pro-rk3568/Kconfig"
- source "board/rockchip/evb_rk3568/Kconfig"
- source "board/pine64/quartz64-a-rk3566/Kconfig"
-+source "board/radxa/rock-3a-rk3568/Kconfig"
- 
- endif
---- /dev/null
-+++ b/board/radxa/rock-3a-rk3568/Kconfig
-@@ -0,0 +1,15 @@
-+if TARGET_ROCK_3A_RK3568
-+
-+config SYS_BOARD
-+	default "rock-3a-rk3568"
-+
-+config SYS_VENDOR
-+	default "radxa"
-+
-+config SYS_CONFIG_NAME
-+	default "rock-3a-rk3568"
-+
-+config BOARD_SPECIFIC_OPTIONS # dummy
-+	def_bool y
-+
-+endif
---- /dev/null
-+++ b/board/radxa/rock-3a-rk3568/Makefile
-@@ -0,0 +1,4 @@
-+# SPDX-License-Identifier:     GPL-2.0+
-+#
-+
-+obj-y	+= rock-3a-rk3568.o
---- /dev/null
-+++ b/board/radxa/rock-3a-rk3568/rock-3a-rk3568.c
-@@ -0,0 +1 @@
-+// SPDX-License-Identifier: GPL-2.0+
 --- /dev/null
 +++ b/configs/rock-3a-rk3568_defconfig
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,98 @@
 +CONFIG_ARM=y
 +CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -658,7 +604,7 @@ Signed-off-by: Marty Jones <[email protected]>
 +CONFIG_SPL_MMC=y
 +CONFIG_SPL_SERIAL=y
 +CONFIG_SPL_STACK_R_ADDR=0x600000
-+CONFIG_TARGET_ROCK_3A_RK3568=y
++CONFIG_TARGET_EVB_RK3568=y
 +CONFIG_DEBUG_UART_BASE=0xFE660000
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_DEBUG_UART=y
@@ -670,6 +616,7 @@ Signed-off-by: Marty Jones <[email protected]>
 +CONFIG_OF_SYSTEM_SETUP=y
 +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
 +# CONFIG_SYS_DEVICE_NULLDEV is not set
++CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
@@ -741,23 +688,3 @@ Signed-off-by: Marty Jones <[email protected]>
 +CONFIG_USB_ETHER_LAN78XX=y
 +CONFIG_USB_ETHER_SMSC95XX=y
 +CONFIG_ERRNO_STR=y
---- /dev/null
-+++ b/include/configs/rock-3a-rk3568.h
-@@ -0,0 +1,17 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+
-+#ifndef __ROCK_3A_RK3568_H
-+#define __ROCK_3A_RK3568_H
-+
-+#include <configs/rk3568_common.h>
-+
-+#define CONFIG_SUPPORT_EMMC_RPMB
-+
-+#define ROCKCHIP_DEVICE_SETTINGS \
-+			"stdout=serial,vidconsole\0" \
-+			"stderr=serial,vidconsole\0"
-+
-+#define CONFIG_USB_OHCI_NEW
-+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-+
-+#endif

include/kernel-5.19

@@ -129,7 +129,7 @@ Signed-off-by: Marty Jones <[email protected]>
 + */
 --- /dev/null
 +++ b/configs/nanopi-r5s-rk3568_defconfig
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,98 @@
 +CONFIG_ARM=y
 +CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -149,6 +149,7 @@ Signed-off-by: Marty Jones <[email protected]>
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_DEBUG_UART=y
 +CONFIG_SYS_LOAD_ADDR=0xc00800
++CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 +CONFIG_API=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
@@ -229,7 +230,7 @@ Signed-off-by: Marty Jones <[email protected]>
 +CONFIG_ERRNO_STR=y
 --- /dev/null
 +++ b/include/configs/nanopi-r5s-rk3568.h
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,14 @@
 +/* SPDX-License-Identifier: GPL-2.0+ */
 +
 +#ifndef __NANOPI_R5S_RK3568_H
@@ -243,7 +244,4 @@ Signed-off-by: Marty Jones <[email protected]>
 +			"stdout=serial,vidconsole\0" \
 +			"stderr=serial,vidconsole\0"
 +
-+#define CONFIG_USB_OHCI_NEW
-+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-+
 +#endif