domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ramips: Cudy X6 fixes / improvements

Browse Source 
- Correct WiFi MACs, they didn't match oem firmware
- Move nvmem-cells to bdinfo partition and remove &bdinfo reference
- Add OEM device model name R13 to SUPPORTED_DEVICES
  This allows sysupgrading from Cudy's OpenWrt fork without force
- Label red_led and use it during failsafe mode and upgrades

MAC addresses as verified by OEM firmware:

use   address             source
LAN   b4:4b:d6:2d:c8:4a   label
WAN   b4:4b:d6:2d:c8:4b   label + 1
2g    b4:4b:d6:2d:c8:4a   label
5g    b6:4b:d6:3d:c8:4a   label + LA-Bit set + 4th oktet increased

The label MAC address is found in bdinfo 0xde00.

Signed-off-by: Felix Baumann <felix.bau@gmx.de>
[read wifi mac from flash offset]
Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
Felix Baumann
2023-04-21 03:07:58 +02:00
committed by David Bauer
parent 097f350aeb
commit 45cf200b2e
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
target/linux/ramips/dts/mt7621_cudy_x6.dts
View File

@@ -11,9 +11,9 @@
aliases { aliases {
led-boot = &led_internet_blue; led-boot = &led_internet_blue;
led-failsafe = &led_internet_blue; led-failsafe = &led_internet_red;
led-running = &led_internet_blue; led-running = &led_internet_blue;
led-upgrade = &led_internet_blue; led-upgrade = &led_internet_red;
label-mac-device = &gmac0; label-mac-device = &gmac0;
}; };
@@ -45,7 +45,7 @@
gpios = <&gpio 15 GPIO_ACTIVE_LOW>; gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
}; };
internet_red { led_internet_red: internet_red {
label = "red:internet"; label = "red:internet";
gpios = <&gpio 16 GPIO_ACTIVE_LOW>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
}; };
@@ -102,10 +102,18 @@
read-only; read-only;
}; };
bdinfo: partition@1ff0000 { partition@1ff0000 {
label = "bdinfo"; label = "bdinfo";
reg = <0x1ff0000 0x10000>; reg = <0x1ff0000 0x10000>;
read-only; read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_bdinfo_de00: macaddr@de00 {
reg = <0xde00 0x6>;
};
}; };
}; };
}; };
@@ -121,6 +129,9 @@
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x0000>; mediatek,mtd-eeprom = <&factory 0x0000>;
mediatek,disable-radar-background; mediatek,disable-radar-background;
nvmem-cells = <&macaddr_bdinfo_de00>;
nvmem-cell-names = "mac-address";
}; };
}; };
@@ -175,13 +186,3 @@
function = "gpio"; function = "gpio";
}; };
}; };
&bdinfo {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_bdinfo_de00: macaddr@de00 {
reg = <0xde00 0x6>;
};
};

1
target/linux/ramips/image/mt7621.mk
View File

@@ -527,6 +527,7 @@ define Device/cudy_x6
DEVICE_MODEL := X6 DEVICE_MODEL := X6
UIMAGE_NAME := R13 UIMAGE_NAME := R13
DEVICE_PACKAGES := kmod-mt7915-firmware -uboot-envtools DEVICE_PACKAGES := kmod-mt7915-firmware -uboot-envtools
SUPPORTED_DEVICES += R13
endef endef
TARGET_DEVICES += cudy_x6 TARGET_DEVICES += cudy_x6

5
target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
View File

@@ -28,8 +28,9 @@ case "$board" in
[ "$PHYNBR" = "1" ] && macaddr_setbit_la $hw_mac_addr > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && macaddr_setbit_la $hw_mac_addr > /sys${DEVPATH}/macaddress
;; ;;
cudy,x6) cudy,x6)
hw_mac_addr="$(mtd_get_mac_binary factory 0x4)" hw_mac_addr="$(mtd_get_mac_binary bdinfo 0xde00)"
macaddr_add $hw_mac_addr "$PHYNBR" > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && \
macaddr_setbit_la "$(macaddr_add $hw_mac_addr 0x100000)" > /sys${DEVPATH}/macaddress
;; ;;
dlink,dap-x1860-a1) dlink,dap-x1860-a1)
hw_mac_addr="$(mtd_get_mac_binary factory 0x4)" hw_mac_addr="$(mtd_get_mac_binary factory 0x4)"