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

* https://github.com/coolsnowwolf/lede: kernel: modules: jitterentropy_rng requires SHA3 support for kernel 6.1.87+ atf-rockchip-vendor: add rk3528 support sunxi: add and set 6.6 testing kernel kernel: bump 5.4 to 5.4.274 (coolsnowwolf#12096) kernel: bump 5.10 to 5.10.215 (coolsnowwolf#12095) arm-trusted-firmware-rockchip-vendor: revert version r8168: update to version 8.053.00 r8125: update to version 9.013.02-2 intel-microcode: update to 20240312 ipq-wifi: update to version 2024-04-16
yjh126yjh · Apr 27, 2024 · 492f37c · 492f37c
2 parents e447c58 + 80fdc89
commit 492f37c
Show file tree

Hide file tree

Showing 76 changed files with 2,024 additions and 847 deletions.
diff --git a/include/kernel-5.10 b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .214
-LINUX_KERNEL_HASH-5.10.214 = 40f014d53e81f204f6d2a364aae4201ae07970dd1b70dc602d7c66c1a140f558
+LINUX_VERSION-5.10 = .215
+LINUX_KERNEL_HASH-5.10.215 = 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9
diff --git a/include/kernel-5.4 b/include/kernel-5.4
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .273
-LINUX_KERNEL_HASH-5.4.273 = 8ba0cfd3faa7222542b30791def49f426d7b50a07217366ead655a5687534743
+LINUX_VERSION-5.4 = .274
+LINUX_KERNEL_HASH-5.4.274 = eac7b421a43cd46a3dbebf7c85d075faa7e164d80d215d31fcd35544b6f79ed4
diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile b/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
@@ -1,17 +1,17 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
-# Copyright (C) 2021-2023 ImmortalWrt.org
+# Copyright (C) 2022 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=arm-trusted-firmware-rockchip-vendor
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/rockchip-linux/rkbin.git
-PKG_SOURCE_DATE:=2024-02-22
-PKG_SOURCE_VERSION:=a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0
-PKG_MIRROR_HASH:=ada1db5d73938c61847b3608844bb5a95d26a92574677e21322327d4438db19f
+PKG_SOURCE_DATE:=2023-07-26
+PKG_SOURCE_VERSION:=b4558da0860ca48bf1a571dd33ccba580b9abe23
+PKG_MIRROR_HASH:=039f0f72d0dd179487b5d4b135d13684b220f3d81fa7308a34431a86701f69c6
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
@@ -55,12 +55,6 @@ define Package/arm-trusted-firmware-rk3568
     VARIANT:=rk3568
 endef
 
-define Package/arm-trusted-firmware-rk3588
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3588
-endef
-
 define Build/Configure
 	$(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' $(PKG_BUILD_DIR)/trust.ini
 	$(SED) 's,$$$$(VARIANT),$(BUILD_VARIANT),g' $(PKG_BUILD_DIR)/trust.ini
@@ -90,12 +84,8 @@ endef
 define Package/arm-trusted-firmware-rk3568/install
 endef
 
-define Package/arm-trusted-firmware-rk3588/install
-endef
-
 $(eval $(call BuildPackage,arm-trusted-firmware-rk3328))
 $(eval $(call BuildPackage,arm-trusted-firmware-rk3399))
 $(eval $(call BuildPackage,arm-trusted-firmware-rk3528))
 $(eval $(call BuildPackage,arm-trusted-firmware-rk3566))
 $(eval $(call BuildPackage,arm-trusted-firmware-rk3568))
-$(eval $(call BuildPackage,arm-trusted-firmware-rk3588))
diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/atf-version.mk b/package/boot/arm-trusted-firmware-rockchip-vendor/atf-version.mk
diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh b/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh
@@ -18,20 +18,20 @@ case "$VARIANT" in
 	LOADER="rk33/rk3399_miniloader_v1.30.bin"
 	;;
 "rk3528")
-	ATF="rk35/rk3528_bl31_v1.17.elf"
-	DDR="rk35/rk3528_ddr_1056MHz_v1.09.bin"
+	ATF="rk35/rk3528_bl31_v1.16.elf"
+	DDR="rk35/rk3528_ddr_1056MHz_v1.06.bin"
 	;;
 "rk3566")
-	ATF="rk35/rk3568_bl31_v1.44.elf"
-	DDR="rk35/rk3566_ddr_1056MHz_v1.21.bin"
+	ATF="rk35/rk3568_bl31_v1.43.elf"
+	DDR="rk35/rk3566_ddr_1056MHz_v1.18.bin"
 	;;
 "rk3568")
-	ATF="rk35/rk3568_bl31_v1.44.elf"
-	DDR="rk35/rk3568_ddr_1560MHz_v1.21.bin"
+	ATF="rk35/rk3568_bl31_v1.43.elf"
+	DDR="rk35/rk3568_ddr_1560MHz_v1.18.bin"
 	;;
 "rk3588")
-	ATF="rk35/rk3588_bl31_v1.45.elf"
-	DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"
+	ATF="rk35/rk3588_bl31_v1.40.elf"
+	DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin"
 	;;
 *)
 	echo -e "Not compatible with your platform: $VARIANT."
@@ -43,7 +43,7 @@ set -x
 if [ "$ACTION" == "build" ]; then
 	case "$VARIANT" in
 	rk33*)
-		mkimage -n "$VARIANT" -T "rksd" -d "$PKG_BUILD_DIR/bin/$DDR" "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
+		"$PKG_BUILD_DIR"/tools/mkimage -n "$VARIANT" -T "rksd" -d "$PKG_BUILD_DIR/bin/$DDR" "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
 		cat "$PKG_BUILD_DIR/bin/$LOADER" >> "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
 		"$PKG_BUILD_DIR/tools/trust_merger" --replace "bl31.elf" "$PKG_BUILD_DIR/bin/$ATF" "$PKG_BUILD_DIR/trust.ini"
 		;;

diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
@@ -188,8 +188,8 @@ define U-Boot/panther-x2-rk3566
     panther_x2
   DEPENDS:=+PACKAGE_u-boot-panther-x2-rk3566:arm-trusted-firmware-rk3566
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3566_ddr_1056MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3566_ddr_1056MHz_v1.18.bin
 endef
 
 # RK3568 boards
@@ -201,8 +201,8 @@ define U-Boot/lyt-t68m-rk3568
     lyt_t68m
   DEPENDS:=+PACKAGE_u-boot-lyt-t68m-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/mrkaio-m68s-rk3568
@@ -213,8 +213,8 @@ define U-Boot/mrkaio-m68s-rk3568
     ezpro_mrkaio-m68s-plus
   DEPENDS:=+PACKAGE_u-boot-mrkaio-m68s-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/nanopi-r5s-rk3568
@@ -225,8 +225,8 @@ define U-Boot/nanopi-r5s-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.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/opc-h68k-rk3568
@@ -238,8 +238,8 @@ define U-Boot/opc-h68k-rk3568
     hinlink_opc-h69k
   DEPENDS:=+PACKAGE_u-boot-opc-h68k-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/photonicat-rk3568
@@ -249,8 +249,8 @@ define U-Boot/photonicat-rk3568
     ariaboard_photonicat
   DEPENDS:=+PACKAGE_u-boot-photonicat-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/radxa-e25-rk3568
@@ -260,8 +260,8 @@ define U-Boot/radxa-e25-rk3568
     radxa_e25
   DEPENDS:=+PACKAGE_u-boot-radxa-e25-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/rock-3a-rk3568
@@ -271,8 +271,8 @@ define U-Boot/rock-3a-rk3568
     radxa_rock-3a
   DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/r66s-rk3568
@@ -283,8 +283,8 @@ define U-Boot/r66s-rk3568
     fastrhino_r68s
   DEPENDS:=+PACKAGE_u-boot-r66s-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/seewo-sv21-rk3568
@@ -294,8 +294,8 @@ define U-Boot/seewo-sv21-rk3568
     seewo_sv21-rk3568
   DEPENDS:=+PACKAGE_u-boot-seewo-sv21-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/station-p2-rk3568
@@ -305,8 +305,8 @@ define U-Boot/station-p2-rk3568
        firefly_station-p2
   DEPENDS:=+PACKAGE_u-boot-station-p2-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 define U-Boot/advantech-rsb4810-rk3568
@@ -316,8 +316,8 @@ define U-Boot/advantech-rsb4810-rk3568
        advantech_rsb4810
   DEPENDS:=+PACKAGE_u-boot-advantech-rsb4810-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  ATF:=rk3568_bl31_v1.43.elf
+  DDR:=rk3568_ddr_1560MHz_v1.18.bin
 endef
 
 UBOOT_TARGETS := \
@@ -354,12 +354,12 @@ UBOOT_MAKE_FLAGS += \
   PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
   BL31=$(STAGING_DIR_IMAGE)/$(ATF)
 
-ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3566),y)
+ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3568),y)
 UBOOT_MAKE_FLAGS += \
   ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
 endif
 
-ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3568),y)
+ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3566),y)
 UBOOT_MAKE_FLAGS += \
   ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
 endif

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
@@ -132,12 +132,6 @@ define U-Boot/OLIMEX_A13_SOM
   BUILD_DEVICES:=olimex_a13-olimex-som
 endef
 
-define U-Boot/licheepi_nano
-  BUILD_SUBTARGET:=arm926ejs
-  NAME:=LicheePi Nano
-  BUILD_DEVICES:=licheepi-nano
-endef
-
 define U-Boot/Linksprite_pcDuino
   BUILD_SUBTARGET:=cortexa8
   NAME:=Linksprite pcDuino
@@ -249,12 +243,6 @@ define U-Boot/pangolin
   UENV:=pangolin
 endef
 
-define U-Boot/popstick
-  BUILD_SUBTARGET:=arm926ejs
-  NAME:=PopStick
-  BUILD_DEVICES:=popstick-v1.1
-endef
-
 define U-Boot/libretech_all_h3_cc_h5
   BUILD_SUBTARGET:=cortexa53
   NAME:=Libre Computer ALL-H3-CC H5
@@ -358,15 +346,6 @@ define U-Boot/orangepi_zero3
   ATF:=h616
 endef
 
-define U-Boot/hechuang_x98h
-  BUILD_SUBTARGET:=cortexa53
-  NAME:=Hechuang X98H
-  BUILD_DEVICES:=hechuang_x98h
-  DEPENDS:=+PACKAGE_u-boot-hechuang_x98h:trusted-firmware-a-sunxi-h616
-  UENV:=h616
-  ATF:=h616
-endef
-
 define U-Boot/Bananapi_M2_Ultra
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M2 Ultra
@@ -404,12 +383,10 @@ UBOOT_TARGETS := \
 	Cubieboard \
 	Cubieboard2 \
 	Cubietruck \
-	hechuang_x98h \
 	Hummingbird_A31 \
 	Marsboard_A10 \
 	Mele_M9 \
 	OLIMEX_A13_SOM \
-	licheepi_nano \
 	Linksprite_pcDuino \
 	Linksprite_pcDuino3 \
 	Linksprite_pcDuino3_Nano \
@@ -434,7 +411,6 @@ UBOOT_TARGETS := \
 	orangepi_zero2 \
 	orangepi_zero3 \
 	pangolin \
-	popstick \
 	pine64_plus \
 	Sinovoip_BPI_M3 \
 	sopine_baseboard \