Skip to content

Commit 1643e58

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: bump 5.19 to 5.19.5 rockchip: fix kernel 5.10 build error (coolsnowwolf#10017) wolfssl: Rebuild when libwolfssl-benchmark gets changes kernel: enable inside secure driver for MediaTek platforms mediatek: remove crypto-hw-mtk package mt76: add mt7986 wmac support mediatek: add filogic subtarget mediatek: add mt7986 soc support to the target uboot-mediatek: add support for compressed BL3/FIP image arm-trusted-firmware-mediatek: update to v2.7+ from MediaTek arm-trusted-firmware-mediatek: remove no longer needed Configure step trusted-firmware-a.mk: pass DTC path similar to u-boot.mk tools: mkimage: Add support for MediaTek MT798x
2 parents 3b4f7cb + fc76404 commit 1643e58

File tree

60 files changed

+6881
-270
lines changed

Some content is hidden

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

60 files changed

+6881
-270
lines changed

‎include/kernel-5.19

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.19 = .4
2-
LINUX_KERNEL_HASH-5.19.4 = a9214b97085af98dfcaaa8c2e8eff4858c1d53dccd6c58931cf7b0455ff9bf87
1+
LINUX_VERSION-5.19 = .5
2+
LINUX_KERNEL_HASH-5.19.5 = 8c3f1cc4f93e50056bb0a8c15a41a8eb6acc7fd71bff6de60b1ef8c4532537bd

‎include/trusted-firmware-a.mk

+3
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,13 @@ define Build/Trusted-Firmware-A/Target
6969
endef
7070

7171

72+
DTC=$(wildcard $(LINUX_DIR)/scripts/dtc/dtc)
73+
7274
define Build/Compile/Trusted-Firmware-A
7375
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
7476
CROSS_COMPILE=$(TARGET_CROSS) \
7577
OPENSSL_DIR=$(STAGING_DIR_HOST) \
78+
$(if $(DTC),DTC="$(DTC)") \
7679
PLAT=$(PLAT) \
7780
BUILD_STRING="OpenWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
7881
$(TFA_MAKE_FLAGS)

‎package/boot/arm-trusted-firmware-mediatek/Makefile

+121-14
Original file line numberDiff line numberDiff line change
@@ -13,68 +13,166 @@ PKG_RELEASE:=$(AUTORELEASE)
1313

1414
PKG_SOURCE_PROTO:=git
1515
PKG_SOURCE_URL=https://github.com/mtk-openwrt/arm-trusted-firmware.git
16-
PKG_SOURCE_DATE:=2021-05-08
17-
PKG_SOURCE_VERSION:=d2c75b2139be003887af9cc5a94da5e9bdc59de7
18-
PKG_MIRROR_HASH:=4af9ce8e11511afee7f588cc982946c06339edbfa47afef6a7f3e2231ac9f34d
16+
PKG_SOURCE_DATE:=2022-08-18
17+
PKG_SOURCE_VERSION:=9c9c49945c24634e4ae6cd924dbb88cf85c7926d
18+
PKG_MIRROR_HASH:=26b474f40c02da12b7bed56597aeef209757ad1b40a4f0a652794954018b2198
1919

2020
PKG_MAINTAINER:=Daniel Golle <[email protected]>
2121

22+
include $(INCLUDE_DIR)/kernel.mk
2223
include $(INCLUDE_DIR)/trusted-firmware-a.mk
2324
include $(INCLUDE_DIR)/package.mk
2425

2526
define Trusted-Firmware-A/Default
2627
BUILD_TARGET:=mediatek
27-
BUILD_SUBTARGET:=mt7622
28-
PLAT:=mt7622
2928
TFA_IMAGE:=bl2.img bl31.bin
3029
BOOT_DEVICE:=
3130
DDR3_FLYBY:=
31+
DDR_TYPE:=
32+
NAND_TYPE:=
3233
endef
3334

3435
define Trusted-Firmware-A/mt7622-nor-1ddr
3536
NAME:=MediaTek MT7622 (SPI-NOR, 1x DDR3)
37+
BUILD_SUBTARGET:=mt7622
38+
PLAT:=mt7622
3639
BOOT_DEVICE:=nor
3740
endef
3841

3942
define Trusted-Firmware-A/mt7622-nor-2ddr
4043
NAME:=MediaTek MT7622 (SPI-NOR, 2x DDR3)
44+
BUILD_SUBTARGET:=mt7622
45+
PLAT:=mt7622
4146
BOOT_DEVICE:=nor
4247
DDR3_FLYBY:=1
4348
endef
4449

4550
define Trusted-Firmware-A/mt7622-snand-1ddr
4651
NAME:=MediaTek MT7622 (SPI-NAND, 1x DDR3)
52+
BUILD_SUBTARGET:=mt7622
53+
PLAT:=mt7622
4754
BOOT_DEVICE:=snand
4855
endef
4956

5057
define Trusted-Firmware-A/mt7622-snand-2ddr
5158
NAME:=MediaTek MT7622 (SPI-NAND, 2x DDR3)
59+
BUILD_SUBTARGET:=mt7622
60+
PLAT:=mt7622
5261
BOOT_DEVICE:=snand
5362
DDR3_FLYBY:=1
5463
endef
5564

5665
define Trusted-Firmware-A/mt7622-emmc-1ddr
5766
NAME:=MediaTek MT7622 (eMMC, 1x DDR3)
67+
BUILD_SUBTARGET:=mt7622
68+
PLAT:=mt7622
5869
BOOT_DEVICE:=emmc
5970
endef
6071

6172
define Trusted-Firmware-A/mt7622-emmc-2ddr
6273
NAME:=MediaTek MT7622 (eMMC, 2x DDR3)
74+
BUILD_SUBTARGET:=mt7622
75+
PLAT:=mt7622
6376
BOOT_DEVICE:=emmc
6477
DDR3_FLYBY:=1
6578
endef
6679

6780
define Trusted-Firmware-A/mt7622-sdmmc-1ddr
68-
NAME:=MediaTek MT7622 (SDcard, 1x DDR3)
81+
NAME:=MediaTek MT7622 (SD card, 1x DDR3)
82+
BUILD_SUBTARGET:=mt7622
83+
PLAT:=mt7622
6984
BOOT_DEVICE:=sdmmc
7085
endef
7186

7287
define Trusted-Firmware-A/mt7622-sdmmc-2ddr
73-
NAME:=MediaTek MT7622 (SDcard, 2x DDR3)
88+
NAME:=MediaTek MT7622 (SD card, 2x DDR3)
89+
BUILD_SUBTARGET:=mt7622
90+
PLAT:=mt7622
7491
BOOT_DEVICE:=sdmmc
7592
DDR3_FLYBY:=1
7693
endef
7794

95+
define Trusted-Firmware-A/mt7986-nor-ddr4
96+
NAME:=MediaTek MT7986 (SPI-NOR, DDR4)
97+
BOOT_DEVICE:=nor
98+
BUILD_SUBTARGET:=filogic
99+
PLAT:=mt7986
100+
DDR_TYPE:=ddr4
101+
endef
102+
103+
define Trusted-Firmware-A/mt7986-emmc-ddr4
104+
NAME:=MediaTek MT7986 (eMMC, DDR4)
105+
BOOT_DEVICE:=emmc
106+
BUILD_SUBTARGET:=filogic
107+
PLAT:=mt7986
108+
DDR_TYPE:=ddr4
109+
endef
110+
111+
define Trusted-Firmware-A/mt7986-sdmmc-ddr4
112+
NAME:=MediaTek MT7986 (SD card, DDR4)
113+
BOOT_DEVICE:=sdmmc
114+
BUILD_SUBTARGET:=filogic
115+
PLAT:=mt7986
116+
DDR_TYPE:=ddr4
117+
endef
118+
119+
define Trusted-Firmware-A/mt7986-snand-ddr4
120+
NAME:=MediaTek MT7986 (SPI-NAND via SNFI, DDR4)
121+
BOOT_DEVICE:=snand
122+
BUILD_SUBTARGET:=filogic
123+
PLAT:=mt7986
124+
DDR_TYPE:=ddr4
125+
endef
126+
127+
define Trusted-Firmware-A/mt7986-spim-nand-ddr4
128+
NAME:=MediaTek MT7986 (SPI-NAND via SPIM, DDR4)
129+
BOOT_DEVICE:=spim-nand
130+
BUILD_SUBTARGET:=filogic
131+
PLAT:=mt7986
132+
DDR_TYPE:=ddr4
133+
NAND_TYPE:=spim:2k+64
134+
endef
135+
136+
define Trusted-Firmware-A/mt7986-nor-ddr3
137+
NAME:=MediaTek MT7986 (SPI-NOR, DDR3)
138+
BOOT_DEVICE:=nor
139+
BUILD_SUBTARGET:=filogic
140+
PLAT:=mt7986
141+
DDR_TYPE:=ddr3
142+
endef
143+
144+
define Trusted-Firmware-A/mt7986-emmc-ddr3
145+
NAME:=MediaTek MT7986 (eMMC, DDR3)
146+
BOOT_DEVICE:=emmc
147+
BUILD_SUBTARGET:=filogic
148+
PLAT:=mt7986
149+
DDR_TYPE:=ddr3
150+
endef
151+
152+
define Trusted-Firmware-A/mt7986-sdmmc-ddr3
153+
NAME:=MediaTek MT7986 (SD card, DDR3)
154+
BOOT_DEVICE:=sdmmc
155+
BUILD_SUBTARGET:=filogic
156+
PLAT:=mt7986
157+
DDR_TYPE:=ddr3
158+
endef
159+
160+
define Trusted-Firmware-A/mt7986-snand-ddr3
161+
NAME:=MediaTek MT7986 (SPI-NAND via SNFI, DDR3)
162+
BOOT_DEVICE:=snand
163+
BUILD_SUBTARGET:=filogic
164+
PLAT:=mt7986
165+
DDR_TYPE:=ddr3
166+
endef
167+
168+
define Trusted-Firmware-A/mt7986-spim-nand-ddr3
169+
NAME:=MediaTek MT7986 (SPI-NAND via SPIM, DDR3)
170+
BOOT_DEVICE:=spim-nand
171+
BUILD_SUBTARGET:=filogic
172+
PLAT:=mt7986
173+
DDR_TYPE:=ddr3
174+
endef
175+
78176
TFA_TARGETS:= \
79177
mt7622-nor-1ddr \
80178
mt7622-nor-2ddr \
@@ -83,22 +181,31 @@ TFA_TARGETS:= \
83181
mt7622-emmc-1ddr \
84182
mt7622-emmc-2ddr \
85183
mt7622-sdmmc-1ddr \
86-
mt7622-sdmmc-2ddr
184+
mt7622-sdmmc-2ddr \
185+
mt7986-emmc-ddr3 \
186+
mt7986-nor-ddr3 \
187+
mt7986-sdmmc-ddr3 \
188+
mt7986-snand-ddr3 \
189+
mt7986-spim-nand-ddr3 \
190+
mt7986-emmc-ddr4 \
191+
mt7986-nor-ddr4 \
192+
mt7986-sdmmc-ddr4 \
193+
mt7986-snand-ddr4 \
194+
mt7986-spim-nand-ddr4
87195

88196
TFA_MAKE_FLAGS += \
89197
BOOT_DEVICE=$(BOOT_DEVICE) \
90198
USE_MKIMAGE=1 MKIMAGE=$(STAGING_DIR_HOST)/bin/mkimage \
199+
$(if $(findstring ddr4,$(DDR_TYPE)),DRAM_USE_DDR4=1) \
200+
$(if $(NAND_TYPE),NAND_TYPE=$(NAND_TYPE)) \
201+
HAVE_DRAM_OBJ_FILE=yes \
91202
$(if $(DDR3_FLYBY),DDR3_FLYBY=1) \
92203
all
93204

94-
define Build/Configure
95-
$(call Build/Configure/Default)
96-
endef
97-
98205
define Package/trusted-firmware-a/install
99206
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
100-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/mt7622/release/bl2.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-bl2.img
101-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/mt7622/release/bl31.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-bl31.bin
207+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl2.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-bl2.img
208+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl31.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-bl31.bin
102209
endef
103210

104211
$(eval $(call BuildPackage/Trusted-Firmware-A))

‎package/boot/arm-trusted-firmware-mediatek/patches/0001-spi-nor-add-more-Winbond-device-IDs.patch

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From daaac60b504e6d5e77156ad0dc3dceca8b786e2d Mon Sep 17 00:00:00 2001
2+
From: Daniel Golle <[email protected]>
3+
Date: Sat, 27 Aug 2022 03:41:57 +0100
4+
Subject: [PATCH] spi-nor: add more Winbond device IDs
5+
6+
Add device IDs for Winbond W25Q256 and W25Q512 variants.
7+
8+
Signed-off-by: Daniel Golle <[email protected]>
9+
---
10+
drivers/mtd/nor/spi_nor.c | 11 +++++++++--
11+
1 file changed, 9 insertions(+), 2 deletions(-)
12+
13+
--- a/drivers/mtd/nor/spi_nor.c
14+
+++ b/drivers/mtd/nor/spi_nor.c
15+
@@ -327,8 +327,15 @@ int spi_nor_read(unsigned int offset, ui
16+
17+
struct nor_device_info nor_flash_info_table[] = {
18+
{"MX25L51245G", {0xC2, 0x20, 0x1A}, 0x4000000, 0},
19+
- {"W25Q256JW",{0xEF,0x80, 0x19}, 0x2000000, 0},
20+
- {"MX25U25635",{0xC2, 0x25, 0x39}, 0x2000000, 0}
21+
+ {"W25Q256JV-IM", {0xEF, 0x70, 0x19}, 0x2000000, 0},
22+
+ {"W25Q256JV-IQ", {0xEF, 0x40, 0x19}, 0x2000000, 0},
23+
+ {"W25Q256JW", {0xEF, 0x60, 0x19}, 0x2000000, 0},
24+
+ {"W25Q256JW-IM", {0xEF, 0x80, 0x19}, 0x2000000, 0},
25+
+ {"W25Q512JV-IM", {0xEF, 0x70, 0x20}, 0x4000000, 0},
26+
+ {"W25Q512JV-IQ", {0xEF, 0x40, 0x20}, 0x4000000, 0},
27+
+ {"W25Q512NW-IM", {0xEF, 0x80, 0x20}, 0x4000000, 0},
28+
+ {"W25Q512NW-IQ/IN", {0xEF, 0x60, 0x20}, 0x4000000, 0},
29+
+ {"MX25U25635", {0xC2, 0x25, 0x39}, 0x2000000, 0}
30+
};
31+
32+

‎package/boot/arm-trusted-firmware-mediatek/patches/0002-mediatek-mt7622-initialize-watchdog-after-DDR-init.patch

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 2a012775b3ab6e72091c8be1c2d4bf5972407eb5 Mon Sep 17 00:00:00 2001
2+
From: Daniel Golle <[email protected]>
3+
Date: Sat, 27 Aug 2022 21:38:33 +0100
4+
Subject: [PATCH] mediatek: mt7622: initialize watchdog after DDR init
5+
6+
Initializing the WDT before memory calibration breaks reboot at least
7+
on some MT7622 boards like the Bananapi BPi-R64:
8+
NOTICE: BL2: v2.7(release):OpenWrt v2022-08-18-9c9c4994-2 (mt7622-emmc-2ddr)
9+
NOTICE: BL2: Built : 04:00:25, Aug 27 2022
10+
ERROR: Cannot find any pass-window
11+
ERROR: no DATLAT taps pass, DATLAT calibration fail!
12+
ERROR: DATLAT calibration fail, write back to 20!
13+
ERROR: EMI: complex R/W mem test failed: -2
14+
15+
Move watchdog initialization to happen only after memory initialization
16+
has completed to avoid the problem.
17+
18+
Signed-off-by: Daniel Golle <[email protected]>
19+
---
20+
plat/mediatek/mt7622/bl2_plat_setup.c | 2 +-
21+
1 file changed, 1 insertion(+), 1 deletion(-)
22+
23+
--- a/plat/mediatek/mt7622/bl2_plat_setup.c
24+
+++ b/plat/mediatek/mt7622/bl2_plat_setup.c
25+
@@ -277,7 +277,6 @@ void bl2_platform_setup(void)
26+
plat_mt_cpuxgpt_init();
27+
generic_delay_timer_init();
28+
29+
- mtk_wdt_init();
30+
mtk_pin_init();
31+
#ifndef USING_BL2PL
32+
mtk_pll_init();
33+
@@ -285,6 +284,7 @@ void bl2_platform_setup(void)
34+
mtk_pwrap_init();
35+
mtk_pmic_init();
36+
mtk_mem_init();
37+
+ mtk_wdt_init();
38+
39+
mtk_io_setup();
40+
}

‎package/boot/arm-trusted-firmware-mediatek/patches/100-increase-nor-bl3-size.patch

-11
This file was deleted.

‎package/boot/arm-trusted-firmware-mediatek/patches/120-mt7622-bl2_boot_snand-skip-bad-blocks.patch

-40
This file was deleted.

‎package/boot/arm-trusted-firmware-mvebu/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PKG_HASH:=bf3eb3617a74cddd7fb0e0eacbfe38c3258ee07d4c8ed730deef7a175cc3d55b
1313

1414
PKG_MAINTAINER:=Vladimir Vid <[email protected]>
1515

16+
include $(INCLUDE_DIR)/kernel.mk
1617
include $(INCLUDE_DIR)/trusted-firmware-a.mk
1718
include $(INCLUDE_DIR)/package.mk
1819

‎package/boot/arm-trusted-firmware-sunxi/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=license.md
2121

2222
PKG_MAINTAINER:=Hauke Mehrtens <[email protected]>
2323

24+
include $(INCLUDE_DIR)/kernel.mk
2425
include $(INCLUDE_DIR)/trusted-firmware-a.mk
2526
include $(INCLUDE_DIR)/package.mk
2627

‎package/boot/uboot-mediatek/Makefile

+7-2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ define U-Boot/mt7622_ubnt_unifi-6-lr
7474
BL2_BOOTDEV:=nor
7575
BL2_DDRBLOB:=2
7676
DEPENDS:=+trusted-firmware-a-mt7622-nor-2ddr
77+
FIP_COMPRESS:=1
7778
endef
7879

7980
define U-Boot/mt7623a_unielec_u7623
@@ -114,9 +115,13 @@ UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE:.fip=.bin)
114115
Build/Exports:=$(Host/Exports)
115116

116117
define Build/fip-image
118+
$(if $(FIP_COMPRESS),\
119+
xz -f -e -k -9 -C crc32 $(STAGING_DIR_IMAGE)/$(BUILD_SUBTARGET)-$(BL2_BOOTDEV)-$(BL2_DDRBLOB)ddr-bl31.bin ;\
120+
xz -f -e -k -9 -C crc32 $(PKG_BUILD_DIR)/u-boot.bin \
121+
)
117122
$(STAGING_DIR_HOST)/bin/fiptool create \
118-
--soc-fw $(STAGING_DIR_IMAGE)/$(BUILD_SUBTARGET)-$(BL2_BOOTDEV)-$(BL2_DDRBLOB)ddr-bl31.bin \
119-
--nt-fw $(PKG_BUILD_DIR)/u-boot.bin \
123+
--soc-fw $(STAGING_DIR_IMAGE)/$(BUILD_SUBTARGET)-$(BL2_BOOTDEV)-$(BL2_DDRBLOB)ddr-bl31.bin$(if $(FIP_COMPRESS),.xz) \
124+
--nt-fw $(PKG_BUILD_DIR)/u-boot.bin$(if $(FIP_COMPRESS),.xz) \
120125
$(PKG_BUILD_DIR)/u-boot.fip
121126
endef
122127

0 commit comments

Comments
 (0)