Skip to content

Commit f16e99a

Browse files
NonoswordNonosword
authored
Merge branch 'coolsnowwolf:master' into master
2 parents eb319bd + 9546676 commit f16e99a

File tree

304 files changed

+4739
-1460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+4739
-1460
lines changed

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .152
2-
LINUX_KERNEL_HASH-5.15.152 = f0805225f4a5b24d0bba9302c2c2f261c04f737ac5dd931da9b112e9f3e4a47e
1+
LINUX_VERSION-5.15 = .155
2+
LINUX_KERNEL_HASH-5.15.155 = c85859b86d2e6d1fc91ca1be8b44f24a9b5bb9f86869b04a8665a3a6559126e4

‎include/kernel-6.1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.1 = .84
2-
LINUX_KERNEL_HASH-6.1.84 = af97d2ebe14765d0db3af6560309daf08535da25bfad36e5fb3e436f22a1707a
1+
LINUX_VERSION-6.1 = .87
2+
LINUX_KERNEL_HASH-6.1.87 = fc7af16a72e8aee4790b796f1bf5003cb0de6095ea1ffd7d7c7c9a5678d95124

‎include/kernel-6.6

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.6 = .24
2-
LINUX_KERNEL_HASH-6.6.24 = 3e9ef879dae8319338eb0dc2d2c2025c13257fdeddf6245c000cb5a85a8af6f5
1+
LINUX_VERSION-6.6 = .28
2+
LINUX_KERNEL_HASH-6.6.28 = 818716ed13e7dba6aaeae24e3073993e260812ed128d10272e94b922ee6d3394

‎package/base-files/files/lib/functions/system.sh

+1
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ mmc_get_mac_ascii() {
159159
part=$(find_mmc_part "$part_name")
160160
if [ -z "$part" ]; then
161161
echo "mmc_get_mac_ascii: partition $part_name not found!" >&2
162+
return
162163
fi
163164

164165
get_mac_ascii "$part" "$key"

‎package/boot/arm-trusted-firmware-rockchip-vendor/Makefile

+26-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
#
3-
# Copyright (C) 2022 ImmortalWrt.org
3+
# Copyright (C) 2021-2023 ImmortalWrt.org
44

55
include $(TOPDIR)/rules.mk
66

77
PKG_NAME:=arm-trusted-firmware-rockchip-vendor
8-
PKG_RELEASE:=$(AUTORELEASE)
8+
PKG_RELEASE:=1
99

1010
PKG_SOURCE_PROTO:=git
11-
PKG_SOURCE_URL=https://github.com/rockchip-linux/rkbin.git
12-
PKG_SOURCE_DATE:=2023-07-26
13-
PKG_SOURCE_VERSION:=b4558da0860ca48bf1a571dd33ccba580b9abe23
14-
PKG_MIRROR_HASH:=039f0f72d0dd179487b5d4b135d13684b220f3d81fa7308a34431a86701f69c6
11+
PKG_SOURCE_URL:=https://github.com/rockchip-linux/rkbin.git
12+
PKG_SOURCE_DATE:=2024-02-22
13+
PKG_SOURCE_VERSION:=a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0
14+
PKG_MIRROR_HASH:=ada1db5d73938c61847b3608844bb5a95d26a92574677e21322327d4438db19f
1515

1616
PKG_MAINTAINER:=Tianling Shen <[email protected]>
1717

@@ -37,6 +37,12 @@ define Package/arm-trusted-firmware-rk3399
3737
VARIANT:=rk3399
3838
endef
3939

40+
define Package/arm-trusted-firmware-rk3528
41+
$(Package/arm-trusted-firmware-rockchip-vendor)
42+
DEPENDS:=@TARGET_rockchip_armv8
43+
VARIANT:=rk3528
44+
endef
45+
4046
define Package/arm-trusted-firmware-rk3566
4147
$(Package/arm-trusted-firmware-rockchip-vendor)
4248
DEPENDS:=@TARGET_rockchip_armv8
@@ -49,6 +55,12 @@ define Package/arm-trusted-firmware-rk3568
4955
VARIANT:=rk3568
5056
endef
5157

58+
define Package/arm-trusted-firmware-rk3588
59+
$(Package/arm-trusted-firmware-rockchip-vendor)
60+
DEPENDS:=@TARGET_rockchip_armv8
61+
VARIANT:=rk3588
62+
endef
63+
5264
define Build/Configure
5365
$(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' $(PKG_BUILD_DIR)/trust.ini
5466
$(SED) 's,$$$$(VARIANT),$(BUILD_VARIANT),g' $(PKG_BUILD_DIR)/trust.ini
@@ -69,13 +81,21 @@ endef
6981
define Package/arm-trusted-firmware-rk3399/install
7082
endef
7183

84+
define Package/arm-trusted-firmware-rk3528/install
85+
endef
86+
7287
define Package/arm-trusted-firmware-rk3566/install
7388
endef
7489

7590
define Package/arm-trusted-firmware-rk3568/install
7691
endef
7792

93+
define Package/arm-trusted-firmware-rk3588/install
94+
endef
95+
7896
$(eval $(call BuildPackage,arm-trusted-firmware-rk3328))
7997
$(eval $(call BuildPackage,arm-trusted-firmware-rk3399))
98+
$(eval $(call BuildPackage,arm-trusted-firmware-rk3528))
8099
$(eval $(call BuildPackage,arm-trusted-firmware-rk3566))
81100
$(eval $(call BuildPackage,arm-trusted-firmware-rk3568))
101+
$(eval $(call BuildPackage,arm-trusted-firmware-rk3588))

‎package/boot/arm-trusted-firmware-rockchip-vendor/atf-version.mk

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
RK3328_ATF:=rk322xh_bl31_v1.49.elf
2+
RK3328_DDR:=rk3328_ddr_333MHz_v1.19.bin
3+
RK3328_LOADER:=rk322xh_miniloader_v2.50.bin
4+
5+
RK3399_ATF:=rk3399_bl31_v1.36.elf
6+
RK3399_DDR:=rk3399_ddr_800MHz_v1.30.bin
7+
RK3399_LOADER:=rk3399_miniloader_v1.30.bin
8+
9+
RK3528_ATF:=rk3528_bl31_v1.16.elf
10+
RK3528_DDR:=rk3528_ddr_1056MHz_v1.07.bin
11+
12+
RK3568_ATF:=rk3568_bl31_v1.43.elf
13+
RK3568_DDR:=rk3568_ddr_1560MHz_v1.18.bin
14+
RK3566_DDR:=rk3566_ddr_1056MHz_v1.18.bin
15+
16+
RK3588_ATF:=rk3588_bl31_v1.41.elf
17+
RK3588_DDR:=rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.13.bin

‎package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh

+11-7
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,21 @@ case "$VARIANT" in
1717
DDR="rk33/rk3399_ddr_800MHz_v1.30.bin"
1818
LOADER="rk33/rk3399_miniloader_v1.30.bin"
1919
;;
20+
"rk3528")
21+
ATF="rk35/rk3528_bl31_v1.17.elf"
22+
DDR="rk35/rk3528_ddr_1056MHz_v1.09.bin"
23+
;;
2024
"rk3566")
21-
ATF="rk35/rk3568_bl31_v1.43.elf"
22-
DDR="rk35/rk3566_ddr_1056MHz_v1.18.bin"
25+
ATF="rk35/rk3568_bl31_v1.44.elf"
26+
DDR="rk35/rk3566_ddr_1056MHz_v1.21.bin"
2327
;;
2428
"rk3568")
25-
ATF="rk35/rk3568_bl31_v1.43.elf"
26-
DDR="rk35/rk3568_ddr_1560MHz_v1.18.bin"
29+
ATF="rk35/rk3568_bl31_v1.44.elf"
30+
DDR="rk35/rk3568_ddr_1560MHz_v1.21.bin"
2731
;;
2832
"rk3588")
29-
ATF="rk35/rk3588_bl31_v1.40.elf"
30-
DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin"
33+
ATF="rk35/rk3588_bl31_v1.45.elf"
34+
DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"
3135
;;
3236
*)
3337
echo -e "Not compatible with your platform: $VARIANT."
@@ -39,7 +43,7 @@ set -x
3943
if [ "$ACTION" == "build" ]; then
4044
case "$VARIANT" in
4145
rk33*)
42-
"$PKG_BUILD_DIR"/tools/mkimage -n "$VARIANT" -T "rksd" -d "$PKG_BUILD_DIR/bin/$DDR" "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
46+
mkimage -n "$VARIANT" -T "rksd" -d "$PKG_BUILD_DIR/bin/$DDR" "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
4347
cat "$PKG_BUILD_DIR/bin/$LOADER" >> "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
4448
"$PKG_BUILD_DIR/tools/trust_merger" --replace "bl31.elf" "$PKG_BUILD_DIR/bin/$ATF" "$PKG_BUILD_DIR/trust.ini"
4549
;;

‎package/boot/uboot-rockchip/Makefile

+36-24
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ define U-Boot/panther-x2-rk3566
188188
panther_x2
189189
DEPENDS:=+PACKAGE_u-boot-panther-x2-rk3566:arm-trusted-firmware-rk3566
190190
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
191-
ATF:=rk3568_bl31_v1.43.elf
192-
DDR:=rk3566_ddr_1056MHz_v1.18.bin
191+
ATF:=rk3568_bl31_v1.44.elf
192+
DDR:=rk3566_ddr_1056MHz_v1.21.bin
193193
endef
194194

195195
# RK3568 boards
@@ -201,8 +201,8 @@ define U-Boot/lyt-t68m-rk3568
201201
lyt_t68m
202202
DEPENDS:=+PACKAGE_u-boot-lyt-t68m-rk3568:arm-trusted-firmware-rk3568
203203
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
204-
ATF:=rk3568_bl31_v1.43.elf
205-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
204+
ATF:=rk3568_bl31_v1.44.elf
205+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
206206
endef
207207

208208
define U-Boot/mrkaio-m68s-rk3568
@@ -213,8 +213,8 @@ define U-Boot/mrkaio-m68s-rk3568
213213
ezpro_mrkaio-m68s-plus
214214
DEPENDS:=+PACKAGE_u-boot-mrkaio-m68s-rk3568:arm-trusted-firmware-rk3568
215215
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
216-
ATF:=rk3568_bl31_v1.43.elf
217-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
216+
ATF:=rk3568_bl31_v1.44.elf
217+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
218218
endef
219219

220220
define U-Boot/nanopi-r5s-rk3568
@@ -225,8 +225,8 @@ define U-Boot/nanopi-r5s-rk3568
225225
friendlyarm_nanopi-r5s
226226
DEPENDS:=+PACKAGE_u-boot-nanopi-r5s-rk3568:arm-trusted-firmware-rk3568
227227
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
228-
ATF:=rk3568_bl31_v1.43.elf
229-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
228+
ATF:=rk3568_bl31_v1.44.elf
229+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
230230
endef
231231

232232
define U-Boot/opc-h68k-rk3568
@@ -238,8 +238,8 @@ define U-Boot/opc-h68k-rk3568
238238
hinlink_opc-h69k
239239
DEPENDS:=+PACKAGE_u-boot-opc-h68k-rk3568:arm-trusted-firmware-rk3568
240240
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
241-
ATF:=rk3568_bl31_v1.43.elf
242-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
241+
ATF:=rk3568_bl31_v1.44.elf
242+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
243243
endef
244244

245245
define U-Boot/photonicat-rk3568
@@ -249,8 +249,8 @@ define U-Boot/photonicat-rk3568
249249
ariaboard_photonicat
250250
DEPENDS:=+PACKAGE_u-boot-photonicat-rk3568:arm-trusted-firmware-rk3568
251251
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
252-
ATF:=rk3568_bl31_v1.43.elf
253-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
252+
ATF:=rk3568_bl31_v1.44.elf
253+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
254254
endef
255255

256256
define U-Boot/radxa-e25-rk3568
@@ -260,8 +260,8 @@ define U-Boot/radxa-e25-rk3568
260260
radxa_e25
261261
DEPENDS:=+PACKAGE_u-boot-radxa-e25-rk3568:arm-trusted-firmware-rk3568
262262
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
263-
ATF:=rk3568_bl31_v1.43.elf
264-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
263+
ATF:=rk3568_bl31_v1.44.elf
264+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
265265
endef
266266

267267
define U-Boot/rock-3a-rk3568
@@ -271,8 +271,8 @@ define U-Boot/rock-3a-rk3568
271271
radxa_rock-3a
272272
DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
273273
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
274-
ATF:=rk3568_bl31_v1.43.elf
275-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
274+
ATF:=rk3568_bl31_v1.44.elf
275+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
276276
endef
277277

278278
define U-Boot/r66s-rk3568
@@ -283,8 +283,8 @@ define U-Boot/r66s-rk3568
283283
fastrhino_r68s
284284
DEPENDS:=+PACKAGE_u-boot-r66s-rk3568:arm-trusted-firmware-rk3568
285285
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
286-
ATF:=rk3568_bl31_v1.43.elf
287-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
286+
ATF:=rk3568_bl31_v1.44.elf
287+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
288288
endef
289289

290290
define U-Boot/seewo-sv21-rk3568
@@ -294,8 +294,8 @@ define U-Boot/seewo-sv21-rk3568
294294
seewo_sv21-rk3568
295295
DEPENDS:=+PACKAGE_u-boot-seewo-sv21-rk3568:arm-trusted-firmware-rk3568
296296
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
297-
ATF:=rk3568_bl31_v1.43.elf
298-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
297+
ATF:=rk3568_bl31_v1.44.elf
298+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
299299
endef
300300

301301
define U-Boot/station-p2-rk3568
@@ -305,11 +305,23 @@ define U-Boot/station-p2-rk3568
305305
firefly_station-p2
306306
DEPENDS:=+PACKAGE_u-boot-station-p2-rk3568:arm-trusted-firmware-rk3568
307307
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
308-
ATF:=rk3568_bl31_v1.43.elf
309-
DDR:=rk3568_ddr_1560MHz_v1.18.bin
308+
ATF:=rk3568_bl31_v1.44.elf
309+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
310+
endef
311+
312+
define U-Boot/advantech-rsb4810-rk3568
313+
BUILD_SUBTARGET:=armv8
314+
NAME:=Advantech RSB4810
315+
BUILD_DEVICES:= \
316+
advantech_rsb4810
317+
DEPENDS:=+PACKAGE_u-boot-advantech-rsb4810-rk3568:arm-trusted-firmware-rk3568
318+
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
319+
ATF:=rk3568_bl31_v1.44.elf
320+
DDR:=rk3568_ddr_1560MHz_v1.21.bin
310321
endef
311322

312323
UBOOT_TARGETS := \
324+
advantech-rsb4810-rk3568 \
313325
lyt-t68m-rk3568 \
314326
mrkaio-m68s-rk3568 \
315327
opc-h68k-rk3568 \
@@ -342,12 +354,12 @@ UBOOT_MAKE_FLAGS += \
342354
PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
343355
BL31=$(STAGING_DIR_IMAGE)/$(ATF)
344356

345-
ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3568),y)
357+
ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3566),y)
346358
UBOOT_MAKE_FLAGS += \
347359
ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
348360
endif
349361

350-
ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3566),y)
362+
ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3568),y)
351363
UBOOT_MAKE_FLAGS += \
352364
ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
353365
endif

0 commit comments

Comments
 (0)