Skip to content

Commit 44689a4

Browse files
small-white-rabbitsmall-white-rabbit
authored
Merge branch 'openwrt:main' into wax206
2 parents ebd55bb + 996e4cb commit 44689a4

33 files changed

Lines changed: 1106 additions & 87 deletions

File tree

‎include/image-commands.mk‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ define Build/yaffs-filesystem
519519
filesystem_size="filesystem_blocks * 64 * 1024" \
520520
filesystem_size_with_reserve="(filesystem_blocks + 2) * 64 * 1024"; \
521521
head -c $$filesystem_size_with_reserve /dev/zero | tr "\000" "\377" > $@.img \
522-
&& yafut -d $@.img -w -i $@ -o kernel -C 1040 -B 64k -E -P -S $(1) \
522+
&& yafut -d $@.img -w -i $@ -o $(if $(findstring v7,$@),bootimage,kernel) -C 1040 -B 64k -E -P -S $(1) \
523523
&& truncate -s $$filesystem_size $@.img \
524524
&& mv $@.img $@
525525
endef
@@ -557,6 +557,11 @@ define Build/gl-qsdk-factory
557557
$(KDIR_TMP)/$(notdir $(BOOT_SCRIPT))
558558
endef
559559

560+
define Build/kernel-pack-npk
561+
$(STAGING_DIR_HOST)/bin/npk_pack_kernel $@ $@.npk
562+
mv $@.npk $@
563+
endef
564+
560565
define Build/linksys-image
561566
let \
562567
size="$$(stat -c%s $@)" \

‎include/package-pack.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,9 @@ else
383383
exit 1; \
384384
fi
385385

386+
# Touch all files to set mtime to PKG_SOURCE_DATE_EPOCH for reproducible builds
387+
find $$(IDIR_$(1)) -exec touch -d "@$(PKG_SOURCE_DATE_EPOCH)" {} \;
388+
386389
$(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \
387390
--info "name:$(1)$$(ABIV_$(1))" \
388391
--info "version:$(VERSION)" \

‎package/boot/uboot-mediatek/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ define U-Boot/mt7981_cmcc_rax3000m-emmc-ddr3
251251
UBOOT_IMAGE:=u-boot.fip
252252
BL2_BOOTDEV:=emmc
253253
BL2_SOC:=mt7981
254-
BL2_DDRTYPE:=ddr3
254+
BL2_DDRTYPE:=ddr3-1866mhz
255255
DEPENDS:=+trusted-firmware-a-mt7981-emmc-ddr3-1866mhz
256256
endef
257257

@@ -275,7 +275,7 @@ define U-Boot/mt7981_cmcc_rax3000m-nand-ddr3
275275
UBOOT_IMAGE:=u-boot.fip
276276
BL2_BOOTDEV:=spim-nand
277277
BL2_SOC:=mt7981
278-
BL2_DDRTYPE:=ddr3
278+
BL2_DDRTYPE:=ddr3-1866mhz
279279
DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3-1866mhz
280280
endef
281281

‎package/system/rpcd/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
1212

1313
PKG_SOURCE_PROTO:=git
1414
PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git
15-
PKG_MIRROR_HASH:=1628372b214012b2c1c686d03692ee84e04e033669a0269a06de6dac4d20e974
16-
PKG_SOURCE_DATE:=2025-08-09
17-
PKG_SOURCE_VERSION:=1905e096a8b722e67733cd4088026f571b27e521
15+
PKG_MIRROR_HASH:=d1759dec21351e5b2256f641b13bb82b605b3d9bfab5a0b243d101ba961c04f7
16+
PKG_SOURCE_DATE:=2025-09-30
17+
PKG_SOURCE_VERSION:=d4fa147470aab6aee4b23ef6327201c6be069ab1
1818
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
1919

2020
PKG_LICENSE:=ISC

‎target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
model = "TRENDNET TEW-673GRU";
1212

1313
aliases {
14+
label-mac-device = &eth1;
1415
led-boot = &led_wps;
1516
led-failsafe = &led_wps;
1617
led-running = &led_wps;
@@ -97,13 +98,15 @@
9798
wifi@11,0 {
9899
compatible = "pci168c,0029";
99100
reg = <0x8800 0 0 0 0>;
100-
qca,no-eeprom;
101+
nvmem-cells = <&cal_caldata_1000>, <&macaddr_lan 0>;
102+
nvmem-cell-names = "calibration", "mac-address";
101103
};
102104

103105
wifi@12,0 {
104106
compatible = "pci168c,0029";
105107
reg = <0x9000 0 0 0 0>;
106-
qca,no-eeprom;
108+
nvmem-cells = <&cal_caldata_5000>, <&macaddr_wan 1>;
109+
nvmem-cell-names = "calibration", "mac-address";
107110
};
108111
};
109112

@@ -141,6 +144,32 @@
141144
label = "caldata";
142145
reg = <0x660000 0x010000>;
143146
read-only;
147+
148+
nvmem-layout {
149+
compatible = "fixed-layout";
150+
#address-cells = <1>;
151+
#size-cells = <1>;
152+
153+
cal_caldata_1000: calibration@1000 {
154+
reg = <0x1000 0xeb8>;
155+
};
156+
157+
cal_caldata_5000: calibration@5000 {
158+
reg = <0x5000 0xeb8>;
159+
};
160+
161+
macaddr_lan: macaddr@ffa0 {
162+
compatible = "mac-base";
163+
reg = <0xffa0 0x11>;
164+
#nvmem-cell-cells = <1>;
165+
};
166+
167+
macaddr_wan: macaddr@ffb4 {
168+
compatible = "mac-base";
169+
reg = <0xffb4 0x11>;
170+
#nvmem-cell-cells = <1>;
171+
};
172+
};
144173
};
145174

146175
fwconcat1: partition@670000 {
@@ -156,6 +185,9 @@
156185

157186
pll-data = <0x11110000 0x00001099 0x00991099>;
158187

188+
nvmem-cells = <&macaddr_lan 0>;
189+
nvmem-cell-names = "mac-address";
190+
159191
fixed-link {
160192
speed = <1000>;
161193
full-duplex;
@@ -167,5 +199,8 @@
167199

168200
pll-data = <0x11110000 0x00001099 0x00991099>;
169201

202+
nvmem-cells = <&macaddr_wan 0>;
203+
nvmem-cell-names = "mac-address";
204+
170205
phy-handle = <&phy4>;
171206
};

‎target/linux/ath79/dts/ar9330_dlink_dir-505.dts‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
&eth0 {
7474
status = "okay";
7575

76+
nvmem-cells = <&macaddr_mac_4 0>;
77+
nvmem-cell-names = "mac-address";
78+
7679
gmac-config {
7780
device = <&gmac>;
7881
switch-phy-addr-swap = <0>;
@@ -108,12 +111,34 @@
108111
label = "art";
109112
reg = <0x10000 0x10000>;
110113
read-only;
114+
115+
nvmem-layout {
116+
compatible = "fixed-layout";
117+
#address-cells = <1>;
118+
#size-cells = <1>;
119+
120+
cal_art_1000: calibration@1000 {
121+
reg = <0x1000 0x440>;
122+
};
123+
};
111124
};
112125

113-
mac: partition@20000 {
126+
partition@20000 {
114127
label = "mac";
115128
reg = <0x20000 0x10000>;
116129
read-only;
130+
131+
nvmem-layout {
132+
compatible = "fixed-layout";
133+
#address-cells = <1>;
134+
#size-cells = <1>;
135+
136+
macaddr_mac_4: macaddr@4 {
137+
compatible = "mac-base";
138+
reg = <0x4 0x11>;
139+
#nvmem-cell-cells = <1>;
140+
};
141+
};
117142
};
118143

119144
partition@30000 {
@@ -139,5 +164,7 @@
139164

140165
&wmac {
141166
status = "okay";
142-
qca,no-eeprom;
167+
168+
nvmem-cells = <&cal_art_1000>, <&macaddr_mac_4 0>;
169+
nvmem-cell-names = "calibration", "mac-address";
143170
};

‎target/linux/ath79/dts/ar9342_zyxel_nwa1123-ac.dts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,11 @@
3636

3737
&pcie {
3838
status = "okay";
39+
40+
wifi@0,0 {
41+
compatible = "qcom,ath10k";
42+
reg = <0x0000 0 0 0 0>;
43+
nvmem-cells = <&macaddr_mib0_66 0>;
44+
nvmem-cell-names = "mac-address";
45+
};
3946
};

‎target/linux/ath79/dts/ar9342_zyxel_nwa1123-ni.dts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,11 @@
3636

3737
&pcie {
3838
status = "okay";
39+
40+
wifi@0,0 {
41+
compatible = "pci168c,0030";
42+
reg = <0x0000 0 0 0 0>;
43+
nvmem-cells = <&macaddr_mib0_66 0>;
44+
nvmem-cell-names = "mac-address";
45+
};
3946
};

‎target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,8 @@
5858
ath9k: wifi@0,0 {
5959
compatible = "pci168c,0030";
6060
reg = <0x0000 0 0 0 0>;
61-
/* "mac-address" currently does not work for
62-
ath9k pci devices. these below are retained for future
63-
improvements. */
64-
/* nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>;
65-
nvmem-cell-names = "mac-address", "calibration";
66-
*/
67-
qca,no-eeprom; /* remove this when "mac-address" works */
61+
nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>;
62+
nvmem-cell-names = "mac-address", "calibration";
6863
};
6964
};
7065

@@ -109,7 +104,7 @@
109104
read-only;
110105
};
111106

112-
mac: partition@fe0000 {
107+
partition@fe0000 {
113108
label = "mac";
114109
reg = <0xfe0000 0x010000>;
115110
read-only;

‎target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
model = "D-Link DCH-G020 A1";
1212

1313
aliases {
14+
label-mac-device = &eth0;
1415
led-boot = &led_power;
1516
led-failsafe = &led_power;
1617
led-running = &led_power;
@@ -129,6 +130,24 @@
129130
label = "mp";
130131
reg = <0x20000 0x10000>;
131132
read-only;
133+
134+
nvmem-layout {
135+
compatible = "fixed-layout";
136+
#address-cells = <1>;
137+
#size-cells = <1>;
138+
139+
macaddr_mp_1: macaddr@1 {
140+
compatible = "mac-base";
141+
reg = <0x1 0x11>;
142+
#nvmem-cell-cells = <1>;
143+
};
144+
145+
macaddr_mp_13: macaddr@13 {
146+
compatible = "mac-base";
147+
reg = <0x13 0x11>;
148+
#nvmem-cell-cells = <1>;
149+
};
150+
};
132151
};
133152

134153
partition@30000 {
@@ -168,11 +187,14 @@
168187

169188
&eth0 {
170189
status = "okay";
190+
191+
nvmem-cells = <&macaddr_mp_1 0>;
192+
nvmem-cell-names = "mac-address";
171193
};
172194

173195
&wmac {
174196
status = "okay";
175197

176-
nvmem-cells = <&cal_art_1000>;
177-
nvmem-cell-names = "calibration";
198+
nvmem-cells = <&cal_art_1000>, <&macaddr_mp_13 0>;
199+
nvmem-cell-names = "calibration", "mac-address";
178200
};

0 commit comments

Comments
 (0)