Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2023-11-23 15:23:49 +08:00
parent 058fdbf592 a39a49e323
commit 535137df37
41 changed files with 359 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package/emortal/default-settings/files/99-default-settings
View File

@@ -3,19 +3,23 @@
uci -q get system.@imm_init[0] > "/dev/null" || uci -q add system imm_init > "/dev/null"
if ! uci -q get system.@imm_init[0].lang > "/dev/null"; then
uci -q set luci.main.lang="auto"
uci -q commit luci
uci -q batch <<-EOF
set luci.main.lang="auto"
commit luci
uci -q set system.@imm_init[0].lang="1"
uci -q commit system
set system.@imm_init[0].lang="1"
commit system
EOF
fi
if ! uci -q get system.@imm_init[0].anon_mount > "/dev/null"; then
uci -q set fstab.@global[0].anon_mount="1"
uci -q commit fstab
uci -q batch <<-EOF
set fstab.@global[0].anon_mount="1"
commit fstab
uci -q set system.@imm_init[0].anon_mount="1"
uci -q commit system
set system.@imm_init[0].anon_mount="1"
commit system
EOF
fi
ln -sf "/sbin/ip" "/usr/bin/ip"

6
package/emortal/default-settings/files/99-default-settings-chinese
View File

@@ -21,8 +21,10 @@ fi
opkg_mirror="$(uci -q get system.@imm_init[0].opkg_mirror)"
if [ -z "$opkg_mirror" ]; then
opkg_mirror="https://mirrors.vsean.net/openwrt"
uci -q set system.@imm_init[0].opkg_mirror="$opkg_mirror"
uci -q commit system
uci -q batch <<-EOF
set system.@imm_init[0].opkg_mirror="$opkg_mirror"
commit system
EOF
fi
sed -i.bak "s,https://downloads.immortalwrt.org,$opkg_mirror,g" "/etc/opkg/distfeeds.conf"

16
package/emortal/ipv6-helper/files/60-ipv6-hybrid
View File

@@ -3,13 +3,15 @@
uci -q get system.@imm_init[0] > "/dev/null" || uci -q add system imm_init > "/dev/null"
uci -q get system.@imm_init[0].ipv6 > "/dev/null" && exit 0
uci -q set dhcp.lan.ra="hybrid"
uci -q set dhcp.lan.ndp="hybrid"
uci -q set dhcp.lan.dhcpv6="hybrid"
uci -q set dhcp.lan.ra_management="1"
uci -q commit dhcp
uci -q batch <<-EOF
set dhcp.lan.ra="hybrid"
set dhcp.lan.ndp="hybrid"
set dhcp.lan.dhcpv6="hybrid"
set dhcp.lan.ra_management="1"
commit dhcp
uci -q set system.@imm_init[0].ipv6="1"
uci -q commit system
set system.@imm_init[0].ipv6="1"
commit system
EOF
exit 0

2
package/utils/firmware-utils/Makefile
View File

@@ -9,7 +9,7 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
PKG_SOURCE_DATE:=2023-11-21
PKG_SOURCE_VERSION:=12bf1a99bd6eebae90caa144bb4d8b0cd763ff8f
PKG_MIRROR_HASH:=923508e729b4c1fcc497f18ad5fa33c62dc74b9aeac1a3f215b3291892903baf
PKG_MIRROR_HASH:=f711bf80123a6f14737da27ab8dfff87a4d429c74057de355b1693e89f223abc
PKG_BUILD_DEPENDS:=openssl zlib

211
target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts Normal file
View File

@@ -0,0 +1,211 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca956x.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/mtd/partitions/uimage.h>
/ {
compatible = "dlink,covr-p2500-a1", "qca,qca9563";
model = "D-Link COVR-P2500 A1";
aliases {
led-boot = &led_power_green;
led-failsafe = &led_power_red;
led-running = &led_power_green;
led-upgrade = &led_power_red;
};
keys {
compatible = "gpio-keys";
wps {
label = "wps";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
};
reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
};
};
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&jtag_disable_pins>;
lan {
label = "green:lan";
gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
};
led_power_green: power_green {
label = "green:power";
gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
default-state = "on";
};
wlan5g {
label = "green:wlan5g";
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0radio";
};
led_power_red: power_red {
label = "red:power";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
};
wlan2g {
label = "green:wlan2g";
gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1radio";
};
};
virtual_flash {
compatible = "mtd-concat";
devices = <&fwconcat0 &fwconcat1>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
compatible = "openwrt,uimage", "denx,uimage";
openwrt,ih-magic = <0x68737173>;
label = "firmware";
reg = <0x0 0x0>;
};
};
};
};
&spi {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x40000>;
read-only;
};
partition@40000 {
label = "u-boot-env";
reg = <0x40000 0x10000>;
read-only;
};
fwconcat0: partition@50000 {
label = "fwconcat0";
reg = <0x50000 0xe30000>;
};
partition@e80000 {
label = "loader";
reg = <0xe80000 0x10000>;
read-only;
};
fwconcat1: partition@e90000 {
label = "fwconcat1";
reg = <0xe90000 0x160000>;
};
art: partition@ff0000 {
label = "art";
reg = <0xff0000 0x10000>;
read-only;
compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
calibration_ath9k: calibration@1000 {
reg = <0x1000 0x440>;
};
precalibration_ath10k: pre-calibration@5000 {
reg = <0x5000 0x2f20>;
};
};
};
};
};
};
&pcie {
status = "okay";
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0 0 0 0 0>;
nvmem-cells = <&precalibration_ath10k>;
nvmem-cell-names = "pre-calibration";
};
};
&gpio {
phy-reset {
gpio-hog;
gpios = <11 GPIO_ACTIVE_LOW>;
output-low;
line-name = "phy-reset";
};
};
&mdio0 {
status = "okay";
phy0: ethernet-phy@0 {
reg = <0>;
phy-mode = "sgmii";
qca,mib-poll-interval = <500>;
qca,ar8327-initvals = <
0x04 0x00080080 /* PORT0 PAD MODE CTRL */
0x10 0x81000080 /* POWER_ON_STRAP */
0x50 0xcc35cc35 /* LED_CTRL0 */
0x54 0xcb37cb37 /* LED_CTRL1 */
0x58 0x00000000 /* LED_CTRL2 */
0x5c 0x00f3cf00 /* LED_CTRL3 */
0x7c 0x0000007e /* PORT0_STATUS */
>;
};
};
&eth0 {
status = "okay";
pll-data = <0x03000101 0x00000101 0x00001919>;
phy-mode = "sgmii";
phy-handle = <&phy0>;
};
&wmac {
status = "okay";
nvmem-cells = <&calibration_ath9k>;
nvmem-cell-names = "calibration";
};

3
target/linux/ath79/generic/base-files/etc/board.d/01_leds
View File

@@ -230,6 +230,9 @@ devolo,dlan-pro-1200plus-ac|\
devolo,magic-2-wifi)
ucidef_set_led_netdev "plcw" "dLAN" "white:dlan" "eth0.1" "rx"
;;
dlink,covr-p2500-a1)
ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x0e" "" "link"
;;
dlink,dap-1330-a1|\
dlink,dap-1365-a1)
ucidef_set_rssimon "wlan0" "200000" "1"

11
target/linux/ath79/generic/base-files/etc/board.d/02_network
View File

@@ -286,6 +286,10 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \
"0@eth0" "2:wan" "3:lan" "4:lan"
;;
dlink,covr-p2500-a1)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:wan" "4:plc"
;;
dlink,dap-2695-a1)
ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:wan" "6@eth1"
@@ -634,6 +638,13 @@ ath79_setup_macs()
devolo,magic-2-wifi)
label_mac=$(macaddr_add "$(mtd_get_mac_binary art 0x1002)" 3)
;;
dlink,covr-p2500-a1)
lan_mac=$(mtd_get_mac_ascii art "protest_lan_mac")
wan_mac=$(mtd_get_mac_ascii art "protest_lan_mac")
label_mac=$(mtd_get_mac_ascii art "protest_plc_mac")
plc_mac=$(mtd_get_mac_ascii art "protest_plc_mac")
[ -n "$plc_mac" ] && ucidef_set_interface_macaddr "plc" $plc_mac
;;
dlink,dap-1330-a1|\
dlink,dap-1365-a1|\
dlink,dch-g020-a1)

6
target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
View File

@@ -17,6 +17,12 @@ case "$board" in
adtran,bsap1840)
macaddr_add "$(mtd_get_mac_binary 'Board data' 2)" $(($PHYNBR * 8 + 1)) > /sys${DEVPATH}/macaddress
;;
dlink,covr-p2500-a1)
[ "$PHYNBR" -eq 0 ] && \
mtd_get_mac_ascii art "protest_ath1_mac" > /sys${DEVPATH}/macaddress
[ "$PHYNBR" -eq 1 ] && \
mtd_get_mac_ascii art "protest_ath0_mac" > /sys${DEVPATH}/macaddress
;;
dlink,dap-1330-a1|\
dlink,dap-1365-a1|\
dlink,dch-g020-a1)

31
target/linux/ath79/image/generic.mk
View File

@@ -33,6 +33,17 @@ define Build/cybertan-trx
-rm $@-empty.bin
endef
define Build/dlink-sge-signature
( \
crc=$$(gzip -c $@ | tail -c 8 | od -An -tx4 --endian little | cut -d " " -f2); \
cat $@; \
$(MKHASH) md5 $@ ; \
echo $(1); \
echo -n $$crc; \
) > $@.new
mv $@.new $@
endef
define Build/edimax-headers
$(eval edimax_magic=$(word 1,$(1)))
$(eval edimax_model=$(word 2,$(1)))
@@ -995,6 +1006,26 @@ define Device/devolo_magic-2-wifi
endef
TARGET_DEVICES += devolo_magic-2-wifi
define Device/dlink_covr-p2500-a1
$(Device/loader-okli-uimage)
SOC := qca9563
DEVICE_VENDOR := D-Link
DEVICE_MODEL := COVR-P2500
DEVICE_VARIANT := A1
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
LOADER_FLASH_OFFS := 0x050000
LOADER_KERNEL_MAGIC := 0x68737173
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x68737173
IMAGE_SIZE := 14528k
IMAGES += factory.bin recovery.bin
IMAGE/recovery.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
append-rootfs | pad-rootfs | check-size | pad-to 14528k | \
append-loader-okli-uimage $(1) | pad-to 15616k
IMAGE/factory.bin := $$(IMAGE/recovery.bin) | \
dlink-sge-image COVR-P2500 | dlink-sge-signature COVR-P2500
endef
TARGET_DEVICES += dlink_covr-p2500-a1
define Device/dlink_dap-13xx
SOC := qca9533
DEVICE_VENDOR := D-Link

2
target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts
View File

@@ -109,7 +109,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi
View File

@@ -80,7 +80,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts
View File

@@ -85,7 +85,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
View File

@@ -90,7 +90,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
View File

@@ -112,7 +112,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
View File

@@ -81,7 +81,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-imou-lc-hx3001-ubootmod.dts
View File

@@ -103,7 +103,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-jcg-q30.dts
View File

@@ -81,7 +81,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dts
View File

@@ -110,7 +110,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts
View File

@@ -80,7 +80,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
View File

@@ -74,7 +74,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
View File

@@ -86,7 +86,7 @@
};
&mdio_bus {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
View File

@@ -229,7 +229,7 @@
mxl,led-config = <0x0 0x0 0x370 0x80>;
};
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;

4
target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
View File

@@ -136,7 +136,7 @@
mxl,led-config = <0x03f0 0x0 0x0 0x0>;
};
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
@@ -361,4 +361,4 @@
&usb_phy {
status = "okay";
};
};

4
target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
View File

@@ -142,7 +142,7 @@
mxl,led-config = <0x03f0 0x0 0x0 0x0>;
};
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
@@ -379,4 +379,4 @@
&usb_phy {
status = "okay";
};
};

2
target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
View File

@@ -122,7 +122,7 @@
realtek,aldps-enable;
};
switch: switch@31 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 18 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
View File

@@ -143,7 +143,7 @@
realtek,led-link-select = <0xa7 0x0 0x0>;
};
switch: switch@31 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
View File

@@ -72,7 +72,7 @@
};
&mdio {
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
View File

@@ -199,7 +199,7 @@
reg = <6>;
};
switch@0 {
switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts
View File

@@ -120,7 +120,7 @@
reg = <6>;
};
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;

2
target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
View File

@@ -200,7 +200,7 @@
};
&mdio {
switch: switch@31 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
interrupt-controller;

2
target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
View File

@@ -99,7 +99,7 @@
reg = <6>;
};
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 5 0>;

2
target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
View File

@@ -108,7 +108,7 @@
phy-mode = "2500base-x";
};
switch@0 {
switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 5 0>;

2
target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
View File

@@ -99,7 +99,7 @@
reg = <6>;
};
switch: switch@0 {
switch: switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 5 0>;

2
target/linux/mediatek/patches-6.1/010-v6.3-arm64-dts-mt7986-add-Bananapi-R3.patch
View File

@@ -405,7 +405,7 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
+};
+
+&mdio {
+ switch: switch@31 {
+ switch: switch@1f {
+ compatible = "mediatek,mt7531";
+ reg = <31>;
+ interrupt-controller;

1
target/linux/mvebu/files/arch/arm/boot/dts/armada-380-iij-sa-w2.dts
View File

@@ -352,7 +352,6 @@
};
partition@110000 {
compatible = "nvmem-cells";
reg = <0x110000 0xf0000>;
label = "board_info";
read-only;

15
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts
View File

@@ -52,41 +52,36 @@
port@0 {
reg = <0>;
label = "wan";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
port@1 {
reg = <1>;
label = "lan4";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 5>;
nvmem-cell-names = "mac-address";
mac-address-increment = <5>;
};
port@2 {
reg = <2>;
label = "lan3";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 4>;
nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
};
port@3 {
reg = <3>;
label = "lan2";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
};
port@4 {
reg = <4>;
label = "lan1";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
port@6 {

21
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts
View File

@@ -56,9 +56,8 @@
phy-connection-type = "sgmii";
buffer-manager = <&bm>;
bm,pool-long = <2>;
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth2 {
@@ -68,9 +67,8 @@
phy-connection-type = "sgmii";
buffer-manager = <&bm>;
bm,pool-long = <3>;
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
&mdio {
@@ -126,41 +124,36 @@
port@0 {
reg = <0>;
label = "lan5";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 7>;
nvmem-cell-names = "mac-address";
mac-address-increment = <7>;
};
port@1 {
reg = <1>;
label = "lan4";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 6>;
nvmem-cell-names = "mac-address";
mac-address-increment = <6>;
};
port@2 {
reg = <2>;
label = "lan3";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 5>;
nvmem-cell-names = "mac-address";
mac-address-increment = <5>;
};
port@3 {
reg = <3>;
label = "lan2";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 4>;
nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
};
port@4 {
reg = <4>;
label = "lan1";
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
};
port@6 {

16
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi
View File

@@ -211,7 +211,7 @@
buffer-manager = <&bm>;
bm,pool-long = <0>;
bm,pool-short = <1>;
nvmem-cells = <&macaddr_bdinfo_d880>;
nvmem-cells = <&macaddr_bdinfo_d880 0>;
nvmem-cell-names = "mac-address";
fixed-link {
@@ -285,12 +285,16 @@
label = "board-info";
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_bdinfo_d880: macaddr@d880 {
reg = <0xd880 0x6>;
macaddr_bdinfo_d880: macaddr@d880 {
compatible = "mac-base";
reg = <0xd880 0x6>;
#nvmem-cell-cells = <1>;
};
};
};

12
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-nas1dual.dts
View File

@@ -252,12 +252,14 @@
label = "u-boot";
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_fffa8: macaddr@fffa8 {
reg = <0xfffa8 0x6>;
macaddr_uboot_fffa8: macaddr@fffa8 {
reg = <0xfffa8 0x6>;
};
};
};

28
target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
View File

@@ -104,6 +104,20 @@
label = "factory";
reg = <0xf8000 0x8000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_factory_6: macaddr@6 {
reg = <0x6 0x6>;
};
};
};
partition@100000 {
@@ -231,17 +245,3 @@
full-duplex;
};
};
&factory {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_factory_6: macaddr@6 {
reg = <0x6 0x6>;
};
};

2
tools/firmware-utils/Makefile
View File

@@ -13,7 +13,7 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
PKG_SOURCE_DATE:=2023-11-21
PKG_SOURCE_VERSION:=12bf1a99bd6eebae90caa144bb4d8b0cd763ff8f
PKG_MIRROR_HASH:=923508e729b4c1fcc497f18ad5fa33c62dc74b9aeac1a3f215b3291892903baf
PKG_MIRROR_HASH:=f711bf80123a6f14737da27ab8dfff87a4d429c74057de355b1693e89f223abc
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk