Skip to content

Commit 3a4584b

Browse files
small-white-rabbitsmall-white-rabbit
authored
Merge branch 'openwrt:main' into wax206
2 parents af92d01 + 4eae48d commit 3a4584b

42 files changed

Lines changed: 216 additions & 317 deletions

Some content is hidden

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

‎include/download.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ define DownloadMethod/rawgit
238238
[ \! -d $(SUBDIR) ] && \
239239
git clone $(OPTS) $(URL) $(SUBDIR) && \
240240
(cd $(SUBDIR) && git checkout $(SOURCE_VERSION)) && \
241-
export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \
241+
export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --no-show-signature --format='@%ct'` && \
242242
echo "Generating formal git archive (apply .gitattributes rules)" && \
243243
(cd $(SUBDIR) && git config core.abbrev 8 && \
244244
git archive --format=tar HEAD --output=../$(SUBDIR).tar.git) && \

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ define Trusted-Firmware-A/Default
2929
HIDDEN:=y
3030
BOOT_DEVICE:=
3131
DDR3_FLYBY:=
32+
DDR3_FREQ_1866:=
3233
DDR_TYPE:=
3334
NAND_TYPE:=
3435
BOARD_QFN:=
@@ -178,6 +179,7 @@ define Trusted-Firmware-A/mt7981-ram-ddr3
178179
BUILD_SUBTARGET:=filogic
179180
PLAT:=mt7981
180181
DDR_TYPE:=ddr3
182+
DDR3_FREQ_1866:=1
181183
RAM_BOOT_UART_DL:=1
182184
HIDDEN:=
183185
DEFAULT:=TARGET_mediatek_filogic
@@ -199,6 +201,15 @@ define Trusted-Firmware-A/mt7981-emmc-ddr3
199201
DDR_TYPE:=ddr3
200202
endef
201203

204+
define Trusted-Firmware-A/mt7981-emmc-ddr3-1866mhz
205+
NAME:=MediaTek MT7981 (eMMC, DDR3 1866 MHz)
206+
BOOT_DEVICE:=emmc
207+
BUILD_SUBTARGET:=filogic
208+
PLAT:=mt7981
209+
DDR_TYPE:=ddr3
210+
DDR3_FREQ_1866:=1
211+
endef
212+
202213
define Trusted-Firmware-A/mt7981-sdmmc-ddr3
203214
NAME:=MediaTek MT7981 (SD card, DDR3)
204215
BOOT_DEVICE:=sdmmc
@@ -223,6 +234,15 @@ define Trusted-Firmware-A/mt7981-spim-nand-ddr3
223234
DDR_TYPE:=ddr3
224235
endef
225236

237+
define Trusted-Firmware-A/mt7981-spim-nand-ddr3-1866mhz
238+
NAME:=MediaTek MT7981 (SPI-NAND via SPIM, DDR3 1866 MHz)
239+
BOOT_DEVICE:=spim-nand
240+
BUILD_SUBTARGET:=filogic
241+
PLAT:=mt7981
242+
DDR_TYPE:=ddr3
243+
DDR3_FREQ_1866:=1
244+
endef
245+
226246
define Trusted-Firmware-A/mt7981-cudy-tr3000-v1
227247
NAME:=Cudy TR3000 v1 (SPI-NAND via SPIM, DDR3)
228248
BOOT_DEVICE:=spim-nand
@@ -557,11 +577,13 @@ TFA_TARGETS:= \
557577
mt7622-sdmmc-2ddr \
558578
mt7981-ram-ddr3 \
559579
mt7981-emmc-ddr3 \
580+
mt7981-emmc-ddr3-1866mhz \
560581
mt7981-nor-ddr3 \
561582
mt7981-nor-ddr4 \
562583
mt7981-sdmmc-ddr3 \
563584
mt7981-snand-ddr3 \
564585
mt7981-spim-nand-ddr3 \
586+
mt7981-spim-nand-ddr3-1866mhz \
565587
mt7981-spim-nand-ubi-ddr4 \
566588
mt7981-ram-ddr4 \
567589
mt7981-emmc-ddr4 \
@@ -611,6 +633,7 @@ TFA_MAKE_FLAGS += \
611633
$(if $(NAND_TYPE),NAND_TYPE=$(NAND_TYPE)) \
612634
HAVE_DRAM_OBJ_FILE=yes \
613635
$(if $(DDR3_FLYBY),DDR3_FLYBY=1) \
636+
$(if $(DDR3_FREQ_1866),DDR3_FREQ_1866=1) \
614637
$(if $(DRAM_USE_COMB),DRAM_USE_COMB=1) \
615638
$(if $(RAM_BOOT_UART_DL),RAM_BOOT_UART_DL=1) \
616639
$(if $(USE_UBI),UBI=1 $(if $(findstring mt7622,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x80000)) \

‎package/boot/uboot-mediatek/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ define U-Boot/mt7981_cmcc_rax3000m-emmc-ddr3
252252
BL2_BOOTDEV:=emmc
253253
BL2_SOC:=mt7981
254254
BL2_DDRTYPE:=ddr3
255-
DEPENDS:=+trusted-firmware-a-mt7981-emmc-ddr3
255+
DEPENDS:=+trusted-firmware-a-mt7981-emmc-ddr3-1866mhz
256256
endef
257257

258258
define U-Boot/mt7981_cmcc_rax3000m-emmc-ddr4
@@ -276,7 +276,7 @@ define U-Boot/mt7981_cmcc_rax3000m-nand-ddr3
276276
BL2_BOOTDEV:=spim-nand
277277
BL2_SOC:=mt7981
278278
BL2_DDRTYPE:=ddr3
279-
DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
279+
DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3-1866mhz
280280
endef
281281

282282
define U-Boot/mt7981_cmcc_rax3000m-nand-ddr4

‎package/firmware/linux-firmware/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=linux-firmware
11-
PKG_VERSION:=20250808
11+
PKG_VERSION:=20250917
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
16-
PKG_HASH:=c029551b45a15926c9d7a5df1a0b540044064f19157c57fc11d91fd0aade837f
16+
PKG_HASH:=120575b756915a11e736f599316a756b6a29a76d6135ad86208868b21c58fb75
1717

1818
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
1919

‎package/firmware/linux-firmware/intel.mk‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,206 +21,206 @@ $(eval $(call BuildPackage,ice-firmware))
2121
Package/iwl3945-firmware = $(call Package/firmware-default,Intel IWL3945 firmware)
2222
define Package/iwl3945-firmware/install
2323
$(INSTALL_DIR) $(1)/lib/firmware
24-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3945-2.ucode $(1)/lib/firmware
24+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-3945-2.ucode $(1)/lib/firmware
2525
endef
2626
$(eval $(call BuildPackage,iwl3945-firmware))
2727

2828
Package/iwl4965-firmware = $(call Package/firmware-default,Intel IWL4965 firmware)
2929
define Package/iwl4965-firmware/install
3030
$(INSTALL_DIR) $(1)/lib/firmware
31-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-4965-2.ucode $(1)/lib/firmware
31+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-4965-2.ucode $(1)/lib/firmware
3232
endef
3333
$(eval $(call BuildPackage,iwl4965-firmware))
3434

3535
Package/iwlwifi-firmware-iwl100 = $(call Package/firmware-default,Intel Centrino Wireless-N 100 firmware)
3636
define Package/iwlwifi-firmware-iwl100/install
3737
$(INSTALL_DIR) $(1)/lib/firmware
38-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-100-5.ucode $(1)/lib/firmware
38+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-100-5.ucode $(1)/lib/firmware
3939
endef
4040
$(eval $(call BuildPackage,iwlwifi-firmware-iwl100))
4141

4242
Package/iwlwifi-firmware-iwl1000 = $(call Package/firmware-default,Intel Centrino Wireless-N 1000 firmware)
4343
define Package/iwlwifi-firmware-iwl1000/install
4444
$(INSTALL_DIR) $(1)/lib/firmware
45-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware
45+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-1000-5.ucode $(1)/lib/firmware
4646
endef
4747
$(eval $(call BuildPackage,iwlwifi-firmware-iwl1000))
4848

4949
Package/iwlwifi-firmware-iwl105 = $(call Package/firmware-default,Intel Centrino Wireless-N 105 firmware)
5050
define Package/iwlwifi-firmware-iwl105/install
5151
$(INSTALL_DIR) $(1)/lib/firmware
52-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-105-6.ucode $(1)/lib/firmware
52+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-105-6.ucode $(1)/lib/firmware
5353
endef
5454
$(eval $(call BuildPackage,iwlwifi-firmware-iwl105))
5555

5656
Package/iwlwifi-firmware-iwl135 = $(call Package/firmware-default,Intel Centrino Wireless-N 135 firmware)
5757
define Package/iwlwifi-firmware-iwl135/install
5858
$(INSTALL_DIR) $(1)/lib/firmware
59-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-135-6.ucode $(1)/lib/firmware
59+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-135-6.ucode $(1)/lib/firmware
6060
endef
6161
$(eval $(call BuildPackage,iwlwifi-firmware-iwl135))
6262

6363
Package/iwlwifi-firmware-iwl2000 = $(call Package/firmware-default,Intel Centrino Wireless-N 2200 firmware)
6464
define Package/iwlwifi-firmware-iwl2000/install
6565
$(INSTALL_DIR) $(1)/lib/firmware
66-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-2000-6.ucode $(1)/lib/firmware
66+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-2000-6.ucode $(1)/lib/firmware
6767
endef
6868
$(eval $(call BuildPackage,iwlwifi-firmware-iwl2000))
6969

7070
Package/iwlwifi-firmware-iwl2030 = $(call Package/firmware-default,Intel Centrino Wireless-N 2230 firmware)
7171
define Package/iwlwifi-firmware-iwl2030/install
7272
$(INSTALL_DIR) $(1)/lib/firmware
73-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-2030-6.ucode $(1)/lib/firmware
73+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-2030-6.ucode $(1)/lib/firmware
7474
endef
7575
$(eval $(call BuildPackage,iwlwifi-firmware-iwl2030))
7676

7777
Package/iwlwifi-firmware-iwl3160 = $(call Package/firmware-default,Intel Wireless 3160 firmware)
7878
define Package/iwlwifi-firmware-iwl3160/install
7979
$(INSTALL_DIR) $(1)/lib/firmware
80-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3160-17.ucode $(1)/lib/firmware
80+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-3160-17.ucode $(1)/lib/firmware
8181
endef
8282
$(eval $(call BuildPackage,iwlwifi-firmware-iwl3160))
8383

8484
Package/iwlwifi-firmware-iwl3168 = $(call Package/firmware-default,Intel Wireless 3168 firmware)
8585
define Package/iwlwifi-firmware-iwl3168/install
8686
$(INSTALL_DIR) $(1)/lib/firmware
87-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-29.ucode $(1)/lib/firmware
87+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-3168-29.ucode $(1)/lib/firmware
8888
endef
8989
$(eval $(call BuildPackage,iwlwifi-firmware-iwl3168))
9090

9191
Package/iwlwifi-firmware-iwl5000 = $(call Package/firmware-default,Intel Wireless 5100AGN 5300AGN and 5350AGN firmware)
9292
define Package/iwlwifi-firmware-iwl5000/install
9393
$(INSTALL_DIR) $(1)/lib/firmware
94-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware
94+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-5000-5.ucode $(1)/lib/firmware
9595
endef
9696
$(eval $(call BuildPackage,iwlwifi-firmware-iwl5000))
9797

9898
Package/iwlwifi-firmware-iwl5150 = $(call Package/firmware-default,Intel Wireless Wi-Fi 5150AGN firmware)
9999
define Package/iwlwifi-firmware-iwl5150/install
100100
$(INSTALL_DIR) $(1)/lib/firmware
101-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware
101+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-5150-2.ucode $(1)/lib/firmware
102102
endef
103103
$(eval $(call BuildPackage,iwlwifi-firmware-iwl5150))
104104

105105
Package/iwlwifi-firmware-iwl6000g2 = $(call Package/firmware-default,Intel Centrino 6300 and 6200 firmware)
106106
define Package/iwlwifi-firmware-iwl6000g2/install
107107
$(INSTALL_DIR) $(1)/lib/firmware
108-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware
108+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-6000-4.ucode $(1)/lib/firmware
109109
endef
110110
$(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2))
111111

112112
Package/iwlwifi-firmware-iwl6000g2a = $(call Package/firmware-default,Intel Centrino 6205 firmware)
113113
define Package/iwlwifi-firmware-iwl6000g2a/install
114114
$(INSTALL_DIR) $(1)/lib/firmware
115-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware
115+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware
116116
endef
117117
$(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2a))
118118

119119
Package/iwlwifi-firmware-iwl6000g2b = $(call Package/firmware-default,Intel Centrino 6230 1030 130 and 6235 firmware)
120120
define Package/iwlwifi-firmware-iwl6000g2b/install
121121
$(INSTALL_DIR) $(1)/lib/firmware
122-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware
122+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware
123123
endef
124124
$(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2b))
125125

126126
Package/iwlwifi-firmware-iwl6050 = $(call Package/firmware-default,Intel Centrino 6150 and 6250 firmware)
127127
define Package/iwlwifi-firmware-iwl6050/install
128128
$(INSTALL_DIR) $(1)/lib/firmware
129-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware
129+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-6050-5.ucode $(1)/lib/firmware
130130
endef
131131
$(eval $(call BuildPackage,iwlwifi-firmware-iwl6050))
132132

133133
Package/iwlwifi-firmware-iwl7260 = $(call Package/firmware-default,Intel Wireless 7260 firmware)
134134
define Package/iwlwifi-firmware-iwl7260/install
135135
$(INSTALL_DIR) $(1)/lib/firmware
136-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7260-17.ucode $(1)/lib/firmware
136+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-7260-17.ucode $(1)/lib/firmware
137137
endef
138138
$(eval $(call BuildPackage,iwlwifi-firmware-iwl7260))
139139

140140
Package/iwlwifi-firmware-iwl7265 = $(call Package/firmware-default,Intel Wireless 7265 firmware)
141141
define Package/iwlwifi-firmware-iwl7265/install
142142
$(INSTALL_DIR) $(1)/lib/firmware
143-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7265-17.ucode $(1)/lib/firmware
143+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-7265-17.ucode $(1)/lib/firmware
144144
endef
145145
$(eval $(call BuildPackage,iwlwifi-firmware-iwl7265))
146146

147147
Package/iwlwifi-firmware-iwl7265d = $(call Package/firmware-default,Intel Wireless 7265D and 3165 firmware)
148148
define Package/iwlwifi-firmware-iwl7265d/install
149149
$(INSTALL_DIR) $(1)/lib/firmware
150-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7265D-29.ucode $(1)/lib/firmware
150+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-7265D-29.ucode $(1)/lib/firmware
151151
endef
152152
$(eval $(call BuildPackage,iwlwifi-firmware-iwl7265d))
153153

154154
Package/iwlwifi-firmware-iwl8260c = $(call Package/firmware-default,Intel Wireless 8260 and 4165 firmware)
155155
define Package/iwlwifi-firmware-iwl8260c/install
156156
$(INSTALL_DIR) $(1)/lib/firmware
157-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-8000C-36.ucode $(1)/lib/firmware
157+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-8000C-36.ucode $(1)/lib/firmware
158158
endef
159159
$(eval $(call BuildPackage,iwlwifi-firmware-iwl8260c))
160160

161161
Package/iwlwifi-firmware-iwl8265 = $(call Package/firmware-default,Intel Wireless 8265 firmware)
162162
define Package/iwlwifi-firmware-iwl8265/install
163163
$(INSTALL_DIR) $(1)/lib/firmware
164-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-8265-36.ucode $(1)/lib/firmware
164+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-8265-36.ucode $(1)/lib/firmware
165165
endef
166166
$(eval $(call BuildPackage,iwlwifi-firmware-iwl8265))
167167

168168
Package/iwlwifi-firmware-iwl9000 = $(call Package/firmware-default,Intel Wireless 9000 firmware)
169169
define Package/iwlwifi-firmware-iwl9000/install
170170
$(INSTALL_DIR) $(1)/lib/firmware
171-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-46.ucode $(1)/lib/firmware
171+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-9000-pu-b0-jf-b0-46.ucode $(1)/lib/firmware
172172
endef
173173
$(eval $(call BuildPackage,iwlwifi-firmware-iwl9000))
174174

175175
Package/iwlwifi-firmware-iwl9260 = $(call Package/firmware-default,Intel Wireless 9260 firmware)
176176
define Package/iwlwifi-firmware-iwl9260/install
177177
$(INSTALL_DIR) $(1)/lib/firmware
178-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-46.ucode $(1)/lib/firmware
178+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-9260-th-b0-jf-b0-46.ucode $(1)/lib/firmware
179179
endef
180180
$(eval $(call BuildPackage,iwlwifi-firmware-iwl9260))
181181

182182
Package/iwlwifi-firmware-ax101 = $(call Package/firmware-default,Intel AX101 firmware)
183183
define Package/iwlwifi-firmware-ax101/install
184184
$(INSTALL_DIR) $(1)/lib/firmware
185-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-hr-b0-89.ucode $(1)/lib/firmware
185+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-so-a0-hr-b0-89.ucode $(1)/lib/firmware
186186
endef
187187
$(eval $(call BuildPackage,iwlwifi-firmware-ax101))
188188

189189
Package/iwlwifi-firmware-ax200 = $(call Package/firmware-default,Intel AX200 firmware)
190190
define Package/iwlwifi-firmware-ax200/install
191191
$(INSTALL_DIR) $(1)/lib/firmware
192-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-77.ucode $(1)/lib/firmware
192+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-cc-a0-77.ucode $(1)/lib/firmware
193193
endef
194194
$(eval $(call BuildPackage,iwlwifi-firmware-ax200))
195195

196196
Package/iwlwifi-firmware-ax201 = $(call Package/firmware-default,Intel AX201 firmware)
197197
define Package/iwlwifi-firmware-ax201/install
198198
$(INSTALL_DIR) $(1)/lib/firmware
199-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-QuZ-a0-hr-b0-77.ucode $(1)/lib/firmware
199+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-QuZ-a0-hr-b0-77.ucode $(1)/lib/firmware
200200
endef
201201
$(eval $(call BuildPackage,iwlwifi-firmware-ax201))
202202

203203
Package/iwlwifi-firmware-ax210 = $(call Package/firmware-default,Intel AX210 firmware)
204204
define Package/iwlwifi-firmware-ax210/install
205205
$(INSTALL_DIR) $(1)/lib/firmware
206-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-89.ucode $(1)/lib/firmware
207-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware
206+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-ty-a0-gf-a0-89.ucode $(1)/lib/firmware
207+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware
208208
endef
209209
$(eval $(call BuildPackage,iwlwifi-firmware-ax210))
210210

211211
Package/iwlwifi-firmware-ax411 = $(call Package/firmware-default,Intel AX411 firmware)
212212
define Package/iwlwifi-firmware-ax411/install
213213
$(INSTALL_DIR) $(1)/lib/firmware
214-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-gf4-a0-89.ucode $(1)/lib/firmware
215-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-gf4-a0.pnvm $(1)/lib/firmware
214+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-so-a0-gf4-a0-89.ucode $(1)/lib/firmware
215+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-so-a0-gf4-a0.pnvm $(1)/lib/firmware
216216
endef
217217
$(eval $(call BuildPackage,iwlwifi-firmware-ax411))
218218

219219
Package/iwlwifi-firmware-be200 = $(call Package/firmware-default,Intel BE200 firmware)
220220
define Package/iwlwifi-firmware-be200/install
221221
$(INSTALL_DIR) $(1)/lib/firmware
222-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-gl-c0-fm-c0-98.ucode $(1)/lib/firmware
223-
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-gl-c0-fm-c0.pnvm $(1)/lib/firmware
222+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-gl-c0-fm-c0-98.ucode $(1)/lib/firmware
223+
$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-gl-c0-fm-c0.pnvm $(1)/lib/firmware
224224
endef
225225
$(eval $(call BuildPackage,iwlwifi-firmware-be200))
226226

‎package/firmware/linux-firmware/qca_ath11k.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ Package/ath11k-firmware-wcn6855 = $(call Package/firmware-default,WCN6855 ath11k
3030
define Package/ath11k-firmware-wcn6855/install
3131
$(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6855/hw2.0
3232
$(INSTALL_DATA) \
33-
$(PKG_BUILD_DIR)/ath11k/WCN6855/hw2.0/* $(1)/lib/firmware/ath11k/WCN6855/hw2.0/
33+
$(PKG_BUILD_DIR)/ath11k/WCN6855/hw2.0/*.bin $(1)/lib/firmware/ath11k/WCN6855/hw2.0/
34+
$(INSTALL_DATA) \
35+
$(PKG_BUILD_DIR)/ath11k/WCN6855/hw2.0/*.txt $(1)/lib/firmware/ath11k/WCN6855/hw2.0/
3436
$(LN) ./hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
3537
endef
3638
$(eval $(call BuildPackage,ath11k-firmware-wcn6855))

‎package/firmware/linux-firmware/qca_ath12k.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ Package/ath12k-firmware-wcn7850 = $(call Package/firmware-default,WCN7850 ath12k
22
define Package/ath12k-firmware-wcn7850/install
33
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/WCN7850/hw2.0
44
$(INSTALL_DATA) \
5-
$(PKG_BUILD_DIR)/ath12k/WCN7850/hw2.0/* $(1)/lib/firmware/ath12k/WCN7850/hw2.0/
5+
$(PKG_BUILD_DIR)/ath12k/WCN7850/hw2.0/*.bin $(1)/lib/firmware/ath12k/WCN7850/hw2.0/
6+
$(INSTALL_DATA) \
7+
$(PKG_BUILD_DIR)/ath12k/WCN7850/hw2.0/*.txt $(1)/lib/firmware/ath12k/WCN7850/hw2.0/
68
endef
79
$(eval $(call BuildPackage,ath12k-firmware-wcn7850))
810

‎package/kernel/lantiq/ltq-ptm/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
88
include $(INCLUDE_DIR)/kernel.mk
99

1010
PKG_NAME:=ltq-ptm
11-
PKG_RELEASE:=5
11+
PKG_RELEASE:=6
1212

1313
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
1414
PKG_LICENSE:=GPL-2.0+

0 commit comments

Comments
 (0)