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

github-actions[bot] · github-actions[bot] · commit 56e28706397c · 2022-07-25T19:40:06.000Z
* https://github.com/coolsnowwolf/lede: rockchip: drop most ugly hack code wolfssl: Do not activate HW acceleration on armvirt by default generic: 5.15: Disable more config symbols tools/libressl: bump to v3.5.3
diff --git a/package/libs/wolfssl/Config.in b/package/libs/wolfssl/Config.in
@@ -72,7 +72,7 @@ config WOLFSSL_ASM_CAPABLE
 
 choice
 	prompt "Hardware Acceleration"
-	default WOLFSSL_HAS_CPU_CRYPTO if WOLFSSL_ASM_CAPABLE
+	default WOLFSSL_HAS_CPU_CRYPTO if WOLFSSL_ASM_CAPABLE && !TARGET_armvirt
 	default WOLFSSL_HAS_NO_HW
 
 	config WOLFSSL_HAS_NO_HW
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
@@ -923,6 +923,7 @@ CONFIG_CIFS_XATTR=y
 # CONFIG_CLEANCACHE is not set
 # CONFIG_CLKSRC_PISTACHIO is not set
 # CONFIG_CLKSRC_VERSATILE is not set
+# CONFIG_CLKSRC_PISTACHIO is not set
 # CONFIG_CLK_GFM_LPASS_SM8250 is not set
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile
@@ -16,7 +16,7 @@ endef
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug kmod-crypto-hw-rockchip \
+DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \
 		    automount autocore-arm autosamba fdisk cfdisk e2fsprogs ethtool haveged htop \
 		    luci-app-zerotier luci-app-ipsec-vpnd luci-app-diskman usbutils
 
diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts
@@ -79,16 +79,14 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		autorepeat;
 		pinctrl-names = "default";
 		pinctrl-0 = <&reset_button_pin>;
 
 		reset {
+			label = "reset";
 			debounce-interval = <100>;
 			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
-			label = "reset";
 			linux,code = <KEY_RESTART>;
-			wakeup-source;
 		};
 	};
 
diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4se.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4se.dts
@@ -109,16 +109,6 @@
 	};
 };
 
-&emmc_phy {
- status = "okay";
-};
-
-&sdhci {
- bus-width = <8>;
- non-removable;
- status = "okay";
-};
-
 &sdio0 {
 	status = "disabled";
 };
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
@@ -22,16 +22,6 @@ define Device/embedfire_doornet2
 endef
 TARGET_DEVICES += embedfire_doornet2
 
-define Device/embedfire_doornet2-4gb
-  DEVICE_VENDOR := EmbedFire
-  DEVICE_MODEL := DoorNet2 4GB
-  SOC := rk3399
-  UBOOT_DEVICE_NAME := guangmiao-g4c-rk3399
-  IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-img | gzip | append-metadata
-  DEVICE_PACKAGES := kmod-r8168 -urngd
-endef
-TARGET_DEVICES += embedfire_doornet2-4gb
-
 define Device/friendlyarm_nanopi-neo3
   DEVICE_VENDOR := FriendlyARM
   DEVICE_MODEL := NanoPi NEO3
diff --git a/target/linux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch b/target/linux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch
@@ -43,15 +43,3 @@ Signed-off-by: wevsty <ty@wevs.org>
  obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
  obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
  obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
-
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
- 
diff --git a/target/linux/rockchip/patches-5.10/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch b/target/linux/rockchip/patches-5.10/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch
diff --git a/target/linux/rockchip/patches-5.15/108-rockchip-rock-pi-4.patch b/target/linux/rockchip/patches-5.15/108-rockchip-rock-pi-4.patch
diff --git a/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch b/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch
@@ -8,15 +8,3 @@
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
-
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
- 
diff --git a/target/linux/rockchip/patches-5.15/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch b/target/linux/rockchip/patches-5.15/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch
diff --git a/target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch b/target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch
diff --git a/target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch b/target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch
@@ -43,15 +43,3 @@ Signed-off-by: wevsty <ty@wevs.org>
  obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
  obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
  obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
-
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
- 
diff --git a/target/linux/rockchip/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch b/target/linux/rockchip/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch
diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libressl
-PKG_VERSION:=3.4.1
-PKG_HASH:=107ceae6ca800e81cb563584c16afa36d6c7138fade94a2b3e9da65456f7c61c
+PKG_VERSION:=3.5.3
+PKG_HASH:=3ab5e5eaef69ce20c6b170ee64d785b42235f48f2e62b095fca5d7b6672b8b28
 PKG_RELEASE:=1
 
 PKG_CPE_ID:=cpe:/a:openbsd:libressl
