Skip to content

Commit 840891e

Browse files
NonoswordNonosword
authored
Merge branch 'coolsnowwolf:master' into master
2 parents f16e99a + 52a7bf6 commit 840891e

File tree

104 files changed

+2165
-998
lines changed

Some content is hidden

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

104 files changed

+2165
-998
lines changed

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .214
2-
LINUX_KERNEL_HASH-5.10.214 = 40f014d53e81f204f6d2a364aae4201ae07970dd1b70dc602d7c66c1a140f558
1+
LINUX_VERSION-5.10 = .215
2+
LINUX_KERNEL_HASH-5.10.215 = 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .155
2-
LINUX_KERNEL_HASH-5.15.155 = c85859b86d2e6d1fc91ca1be8b44f24a9b5bb9f86869b04a8665a3a6559126e4
1+
LINUX_VERSION-5.15 = .156
2+
LINUX_KERNEL_HASH-5.15.156 = 9f0465d14c93691056f5f94de647601f94f083ad8ce2e5d306564394b13e7778

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .273
2-
LINUX_KERNEL_HASH-5.4.273 = 8ba0cfd3faa7222542b30791def49f426d7b50a07217366ead655a5687534743
1+
LINUX_VERSION-5.4 = .274
2+
LINUX_KERNEL_HASH-5.4.274 = eac7b421a43cd46a3dbebf7c85d075faa7e164d80d215d31fcd35544b6f79ed4

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

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

55
include $(TOPDIR)/rules.mk
66

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

1010
PKG_SOURCE_PROTO:=git
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
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
1515

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

@@ -37,12 +37,6 @@ 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-
4640
define Package/arm-trusted-firmware-rk3566
4741
$(Package/arm-trusted-firmware-rockchip-vendor)
4842
DEPENDS:=@TARGET_rockchip_armv8
@@ -55,12 +49,6 @@ define Package/arm-trusted-firmware-rk3568
5549
VARIANT:=rk3568
5650
endef
5751

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-
6452
define Build/Configure
6553
$(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' $(PKG_BUILD_DIR)/trust.ini
6654
$(SED) 's,$$$$(VARIANT),$(BUILD_VARIANT),g' $(PKG_BUILD_DIR)/trust.ini
@@ -81,21 +69,13 @@ endef
8169
define Package/arm-trusted-firmware-rk3399/install
8270
endef
8371

84-
define Package/arm-trusted-firmware-rk3528/install
85-
endef
86-
8772
define Package/arm-trusted-firmware-rk3566/install
8873
endef
8974

9075
define Package/arm-trusted-firmware-rk3568/install
9176
endef
9277

93-
define Package/arm-trusted-firmware-rk3588/install
94-
endef
95-
9678
$(eval $(call BuildPackage,arm-trusted-firmware-rk3328))
9779
$(eval $(call BuildPackage,arm-trusted-firmware-rk3399))
98-
$(eval $(call BuildPackage,arm-trusted-firmware-rk3528))
9980
$(eval $(call BuildPackage,arm-trusted-firmware-rk3566))
10081
$(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
This file was deleted.

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ case "$VARIANT" in
1818
LOADER="rk33/rk3399_miniloader_v1.30.bin"
1919
;;
2020
"rk3528")
21-
ATF="rk35/rk3528_bl31_v1.17.elf"
22-
DDR="rk35/rk3528_ddr_1056MHz_v1.09.bin"
21+
ATF="rk35/rk3528_bl31_v1.16.elf"
22+
DDR="rk35/rk3528_ddr_1056MHz_v1.06.bin"
2323
;;
2424
"rk3566")
25-
ATF="rk35/rk3568_bl31_v1.44.elf"
26-
DDR="rk35/rk3566_ddr_1056MHz_v1.21.bin"
25+
ATF="rk35/rk3568_bl31_v1.43.elf"
26+
DDR="rk35/rk3566_ddr_1056MHz_v1.18.bin"
2727
;;
2828
"rk3568")
29-
ATF="rk35/rk3568_bl31_v1.44.elf"
30-
DDR="rk35/rk3568_ddr_1560MHz_v1.21.bin"
29+
ATF="rk35/rk3568_bl31_v1.43.elf"
30+
DDR="rk35/rk3568_ddr_1560MHz_v1.18.bin"
3131
;;
3232
"rk3588")
33-
ATF="rk35/rk3588_bl31_v1.45.elf"
34-
DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"
33+
ATF="rk35/rk3588_bl31_v1.40.elf"
34+
DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin"
3535
;;
3636
*)
3737
echo -e "Not compatible with your platform: $VARIANT."
@@ -43,7 +43,7 @@ set -x
4343
if [ "$ACTION" == "build" ]; then
4444
case "$VARIANT" in
4545
rk33*)
46-
mkimage -n "$VARIANT" -T "rksd" -d "$PKG_BUILD_DIR/bin/$DDR" "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
46+
"$PKG_BUILD_DIR"/tools/mkimage -n "$VARIANT" -T "rksd" -d "$PKG_BUILD_DIR/bin/$DDR" "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
4747
cat "$PKG_BUILD_DIR/bin/$LOADER" >> "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
4848
"$PKG_BUILD_DIR/tools/trust_merger" --replace "bl31.elf" "$PKG_BUILD_DIR/bin/$ATF" "$PKG_BUILD_DIR/trust.ini"
4949
;;

‎package/boot/uboot-rockchip/Makefile

+26-26
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.44.elf
192-
DDR:=rk3566_ddr_1056MHz_v1.21.bin
191+
ATF:=rk3568_bl31_v1.43.elf
192+
DDR:=rk3566_ddr_1056MHz_v1.18.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.44.elf
205-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
204+
ATF:=rk3568_bl31_v1.43.elf
205+
DDR:=rk3568_ddr_1560MHz_v1.18.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.44.elf
217-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
216+
ATF:=rk3568_bl31_v1.43.elf
217+
DDR:=rk3568_ddr_1560MHz_v1.18.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.44.elf
229-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
228+
ATF:=rk3568_bl31_v1.43.elf
229+
DDR:=rk3568_ddr_1560MHz_v1.18.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.44.elf
242-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
241+
ATF:=rk3568_bl31_v1.43.elf
242+
DDR:=rk3568_ddr_1560MHz_v1.18.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.44.elf
253-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
252+
ATF:=rk3568_bl31_v1.43.elf
253+
DDR:=rk3568_ddr_1560MHz_v1.18.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.44.elf
264-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
263+
ATF:=rk3568_bl31_v1.43.elf
264+
DDR:=rk3568_ddr_1560MHz_v1.18.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.44.elf
275-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
274+
ATF:=rk3568_bl31_v1.43.elf
275+
DDR:=rk3568_ddr_1560MHz_v1.18.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.44.elf
287-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
286+
ATF:=rk3568_bl31_v1.43.elf
287+
DDR:=rk3568_ddr_1560MHz_v1.18.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.44.elf
298-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
297+
ATF:=rk3568_bl31_v1.43.elf
298+
DDR:=rk3568_ddr_1560MHz_v1.18.bin
299299
endef
300300

301301
define U-Boot/station-p2-rk3568
@@ -305,8 +305,8 @@ 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.44.elf
309-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
308+
ATF:=rk3568_bl31_v1.43.elf
309+
DDR:=rk3568_ddr_1560MHz_v1.18.bin
310310
endef
311311

312312
define U-Boot/advantech-rsb4810-rk3568
@@ -316,8 +316,8 @@ define U-Boot/advantech-rsb4810-rk3568
316316
advantech_rsb4810
317317
DEPENDS:=+PACKAGE_u-boot-advantech-rsb4810-rk3568:arm-trusted-firmware-rk3568
318318
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
319-
ATF:=rk3568_bl31_v1.44.elf
320-
DDR:=rk3568_ddr_1560MHz_v1.21.bin
319+
ATF:=rk3568_bl31_v1.43.elf
320+
DDR:=rk3568_ddr_1560MHz_v1.18.bin
321321
endef
322322

323323
UBOOT_TARGETS := \
@@ -354,12 +354,12 @@ UBOOT_MAKE_FLAGS += \
354354
PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
355355
BL31=$(STAGING_DIR_IMAGE)/$(ATF)
356356

357-
ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3566),y)
357+
ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3568),y)
358358
UBOOT_MAKE_FLAGS += \
359359
ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
360360
endif
361361

362-
ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3568),y)
362+
ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3566),y)
363363
UBOOT_MAKE_FLAGS += \
364364
ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
365365
endif

‎package/boot/uboot-sunxi/Makefile

-24
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,6 @@ define U-Boot/OLIMEX_A13_SOM
132132
BUILD_DEVICES:=olimex_a13-olimex-som
133133
endef
134134

135-
define U-Boot/licheepi_nano
136-
BUILD_SUBTARGET:=arm926ejs
137-
NAME:=LicheePi Nano
138-
BUILD_DEVICES:=licheepi-nano
139-
endef
140-
141135
define U-Boot/Linksprite_pcDuino
142136
BUILD_SUBTARGET:=cortexa8
143137
NAME:=Linksprite pcDuino
@@ -249,12 +243,6 @@ define U-Boot/pangolin
249243
UENV:=pangolin
250244
endef
251245

252-
define U-Boot/popstick
253-
BUILD_SUBTARGET:=arm926ejs
254-
NAME:=PopStick
255-
BUILD_DEVICES:=popstick-v1.1
256-
endef
257-
258246
define U-Boot/libretech_all_h3_cc_h5
259247
BUILD_SUBTARGET:=cortexa53
260248
NAME:=Libre Computer ALL-H3-CC H5
@@ -358,15 +346,6 @@ define U-Boot/orangepi_zero3
358346
ATF:=h616
359347
endef
360348

361-
define U-Boot/hechuang_x98h
362-
BUILD_SUBTARGET:=cortexa53
363-
NAME:=Hechuang X98H
364-
BUILD_DEVICES:=hechuang_x98h
365-
DEPENDS:=+PACKAGE_u-boot-hechuang_x98h:trusted-firmware-a-sunxi-h616
366-
UENV:=h616
367-
ATF:=h616
368-
endef
369-
370349
define U-Boot/Bananapi_M2_Ultra
371350
BUILD_SUBTARGET:=cortexa7
372351
NAME:=Bananapi M2 Ultra
@@ -404,12 +383,10 @@ UBOOT_TARGETS := \
404383
Cubieboard \
405384
Cubieboard2 \
406385
Cubietruck \
407-
hechuang_x98h \
408386
Hummingbird_A31 \
409387
Marsboard_A10 \
410388
Mele_M9 \
411389
OLIMEX_A13_SOM \
412-
licheepi_nano \
413390
Linksprite_pcDuino \
414391
Linksprite_pcDuino3 \
415392
Linksprite_pcDuino3_Nano \
@@ -434,7 +411,6 @@ UBOOT_TARGETS := \
434411
orangepi_zero2 \
435412
orangepi_zero3 \
436413
pangolin \
437-
popstick \
438414
pine64_plus \
439415
Sinovoip_BPI_M3 \
440416
sopine_baseboard \

0 commit comments

Comments
 (0)