hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ramips: ethernet mac cleanup

Browse Source 
Compile tested all subtargets and profiles.
Unfortunately I don't own any board affected by these changes, so no run tests.

Signed-off-by: Roman Yeryomin <roman@advem.lv>

SVN-Revision: 41839
master
John Crispin 11 years ago
parent 443aee86bf
commit b77e92e020
25 changed files with 85 additions and 133 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 36
      target/linux/ramips/base-files/etc/uci-defaults/02_network
  2. 109
      target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
  3. 4
      target/linux/ramips/dts/3G-6200NL.dts
  4. 4
      target/linux/ramips/dts/ALL5003.dts
  5. 4
      target/linux/ramips/dts/AWM002-EVB-4M.dts
  6. 4
      target/linux/ramips/dts/AWM002-EVB-8M.dts
  7. 3
      target/linux/ramips/dts/BR-6475ND.dts
  8. 4
      target/linux/ramips/dts/DAP-1350.dts
  9. 2
      target/linux/ramips/dts/DIR-300-B1.dts
  10. 2
      target/linux/ramips/dts/DIR-600-B1.dts
  11. 2
      target/linux/ramips/dts/DIR-610-A1.dts
  12. 2
      target/linux/ramips/dts/ESR-9753.dts
  13. 2
      target/linux/ramips/dts/FREESTATION5.dts
  14. 4
      target/linux/ramips/dts/HW550-3G.dts
  15. 2
      target/linux/ramips/dts/IP2202.dts
  16. 2
      target/linux/ramips/dts/NBG-419N.dts
  17. 4
      target/linux/ramips/dts/OMNI-EMB.dts
  18. 2
      target/linux/ramips/dts/PX4885.dts
  19. 4
      target/linux/ramips/dts/RT-N10-PLUS.dts
  20. 2
      target/linux/ramips/dts/W306R_V20.dts
  21. 4
      target/linux/ramips/dts/WL341V3.dts
  22. 4
      target/linux/ramips/dts/WL_330N.dts
  23. 4
      target/linux/ramips/dts/WL_330N3G.dts
  24. 4
      target/linux/ramips/dts/WR6202.dts
  25. 4
      target/linux/ramips/dts/XDXRN502J.dts

36
target/linux/ramips/base-files/etc/uci-defaults/02_network
Unescape View File

@ -199,19 +199,22 @@ ramips_setup_macs()
case $board in
br-6475nd)
lan_mac=$(mtd_get_mac_binary devdata 13)
lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(mtd_get_mac_binary devdata 7)
;;
w306r-v20)
lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 5)
;;
tew-691gr)
lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 3)
;;
tew-692gr)
lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 4)
;;
@ -219,10 +222,24 @@ ramips_setup_macs()
m4 |\
x5 |\
x8)
lan_mac=$(macaddr_add "$lan_mac" -1)
lan_mac=$(cat /sys/class/net/eth0/address)
lan_mac=$(macaddr_add "$lan_mac" -2)
;;
dir-620-a1)
bc2 |\
broadway |\
d105 |\
dir-620-a1 |\
esr-9753 |\
freestation5 |\
hlk-rm04 | \
mpr-a1 | \
mpr-a2 | \
dir-300-b7 | \
dir-320-b1 | \
psr-680w |\
sl-r7205)
lan_mac=$(cat /sys/class/net/eth0/address)
lan_mac=$(macaddr_setbit_la "$lan_mac")
wan_mac=$(macaddr_add "$lan_mac" 1)
;;
@ -233,12 +250,13 @@ ramips_setup_macs()
wan_mac=$(mtd_get_mac_ascii nvram wanmac)
;;
nbg-419n | \
wcr-150gn)
wan_mac=$(mtd_get_mac_binary factory 40)
;;
rt-n56u)
lan_mac=$(cat /sys/class/net/eth0/address)
lan_mac=$(macaddr_setbit_la "$lan_mac")
wan_mac=$(mtd_get_mac_binary factory 32772)
;;
@ -250,16 +268,6 @@ ramips_setup_macs()
wan_mac=$(mtd_get_mac_binary factory 46)
;;
wl341v3)
lan_mac=$(mtd_get_mac_binary board-nvram 65440)
wan_mac=$(macaddr_add "$lan_mac" 1)
;;
wr8305rt)
lan_mac=$(mtd_get_mac_binary factory 4)
wan_mac=$(macaddr_add "$lan_mac" 1)
;;
*)
lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 1)

109
target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
Unescape View File

@ -1,109 +0,0 @@
#
# Copyright (C) 2011 OpenWrt.org
#
preinit_set_mac_address() {
local mac
. /lib/functions.sh
. /lib/ramips.sh
case $(ramips_board_name) in
3g-6200n |\
3g-6200nl |\
3g300m | \
dir-620-d1 |\
dir-300-b7 | \
w150m | \
mzk-w300nh2 |\
wl-330n |\
wl-330n3g |\
wr8305rt)
mac=$(mtd_get_mac_binary factory 4)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
bc2 |\
broadway |\
d105 |\
dir-620-a1 |\
esr-9753 |\
freestation5 |\
hlk-rm04 | \
mpr-a1 | \
mpr-a2 | \
dir-300-b7 | \
dir-320-b1 | \
psr-680w |\
rt-n56u |\
sl-r7205)
mac=$(mtd_get_mac_binary factory 4)
mac=$(macaddr_setbit_la "$mac")
ifconfig eth0 hw ether $mac 2>/dev/null
;;
br-6475nd)
mac=$(mtd_get_mac_binary devdata 13)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
asl26555 |\
dir-300-b1 |\
dir-300-b2 |\
dir-600-b1 |\
dir-610-a1)
mac=$(mtd_get_mac_binary devdata 16388)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
cy-swr1100 |\
dir-645)
mac=$(mtd_get_mac_ascii nvram lanmac)
mac=$(macaddr_setbit_la "$mac")
ifconfig eth0 hw ether $mac 2>/dev/null
;;
dap-1350)
mac=$(mtd_get_mac_binary devdata 46)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
all0239-3g |\
all0256n |\
all5002 |\
all5003 |\
awm002-evb |\
carambola |\
dir-615-h1 |\
fonera20n |\
ip2202 |\
rt-n13u |\
hw550-3g |\
nbg-419n |\
omni-emb |\
omni-emb-hpm |\
px4885 |\
tew-691gr |\
tew-692gr |\
w306r-v20 |\
w502u |\
wr6202 |\
wnce2001 |\
xdxrn502j)
mac=$(mtd_get_mac_binary factory 40)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
m3 |\
m4 |\
x5 |\
x8)
mac=$(mtd_get_mac_binary factory 4)
mac=$(macaddr_add "$mac" -1)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
wl341v3)
mac=$(mtd_get_mac_binary board-nvram 65440)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
rt-n10-plus)
mac=$(mtd_get_mac_binary devconf 4)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
esac
}
boot_hook_add preinit_main preinit_set_mac_address

4
target/linux/ramips/dts/3G-6200NL.dts
Unescape View File

@ -54,6 +54,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4>;
};
esw@10110000 {
ralink,portmap = <0x2f>;
};

4
target/linux/ramips/dts/ALL5003.dts
Unescape View File

@ -56,6 +56,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {
ralink,portmap = <0x3f>;
};

4
target/linux/ramips/dts/AWM002-EVB-4M.dts
Unescape View File

@ -5,6 +5,10 @@
/ {
model = "AsiaRF AWM002 EVB";
ethernet@10100000 {
mtd-mac-address = <&factory 0x28>;
};
wmac@10180000 {
ralink,mtd-eeprom = <&factory 0>;
};

4
target/linux/ramips/dts/AWM002-EVB-8M.dts
Unescape View File

@ -5,6 +5,10 @@
/ {
model = "AsiaRF AWM002 EVB";
ethernet@10100000 {
mtd-mac-address = <&factory 0x28>;
};
wmac@10180000 {
ralink,mtd-eeprom = <&factory 0>;
};

3
target/linux/ramips/dts/BR-6475ND.dts
Unescape View File

@ -31,6 +31,7 @@
ethernet@10100000 {
status = "okay";
mtd-mac-address = <&devdata 0x0d>;
port@0 {
ralink,fixed-link = <1000 1 1 1>;
@ -99,7 +100,7 @@
read-only;
};
partition@50000 {
devdata: partition@50000 {
reg = <0x00050000 0x00020000>;
label = "devdata";
read-only;

4
target/linux/ramips/dts/DAP-1350.dts
Unescape View File

@ -58,6 +58,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&devdata 0x2e>;
};
esw@10110000 {
ralink,portmap = <0x2f>;
};

2
target/linux/ramips/dts/DIR-300-B1.dts
Unescape View File

@ -49,7 +49,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4004>;
mtd-mac-address = <&devdata 0x4004>;
};
esw@10110000 {

2
target/linux/ramips/dts/DIR-600-B1.dts
Unescape View File

@ -49,7 +49,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4004>;
mtd-mac-address = <&devdata 0x4004>;
};
esw@10110000 {

2
target/linux/ramips/dts/DIR-610-A1.dts
Unescape View File

@ -53,7 +53,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4004>;
mtd-mac-address = <&devdata 0x4004>;
};
esw@10110000 {

2
target/linux/ramips/dts/ESR-9753.dts
Unescape View File

@ -78,7 +78,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4004>;
mtd-mac-address = <&factory 0x4>;
};
esw@10110000 {

2
target/linux/ramips/dts/FREESTATION5.dts
Unescape View File

@ -53,7 +53,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x28>;
mtd-mac-address = <&factory 0x4>;
};
esw@10110000 {

4
target/linux/ramips/dts/HW550-3G.dts
Unescape View File

@ -48,6 +48,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {
ralink,portmap = <0x3e>;
};

2
target/linux/ramips/dts/IP2202.dts
Unescape View File

@ -49,7 +49,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4>;
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {

2
target/linux/ramips/dts/NBG-419N.dts
Unescape View File

@ -49,7 +49,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4>;
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {

4
target/linux/ramips/dts/OMNI-EMB.dts
Unescape View File

@ -72,6 +72,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {
ralink,portmap = <0x2f>;
};

2
target/linux/ramips/dts/PX4885.dts
Unescape View File

@ -53,7 +53,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x2e>;
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {

4
target/linux/ramips/dts/RT-N10-PLUS.dts
Unescape View File

@ -39,6 +39,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&devconf 0x4>;
};
esw@10110000 {
ralink,portmap = <0x3e>;
};

2
target/linux/ramips/dts/W306R_V20.dts
Unescape View File

@ -49,7 +49,7 @@
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4>;
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {

4
target/linux/ramips/dts/WL341V3.dts
Unescape View File

@ -48,6 +48,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&boardnvram 0xffa0>;
};
esw@10110000 {
ralink,portmap = <0x3e>;
};

4
target/linux/ramips/dts/WL_330N.dts
Unescape View File

@ -52,6 +52,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4>;
};
esw@10110000 {
ralink,portmap = <0x3e>;
};

4
target/linux/ramips/dts/WL_330N3G.dts
Unescape View File

@ -52,6 +52,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x4>;
};
esw@10110000 {
ralink,portmap = <0x3e>;
};

4
target/linux/ramips/dts/WR6202.dts
Unescape View File

@ -81,6 +81,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {
ralink,portmap = <0x3e>;
};

4
target/linux/ramips/dts/XDXRN502J.dts
Unescape View File

@ -48,6 +48,10 @@
};
};
ethernet@10100000 {
mtd-mac-address = <&factory 0x28>;
};
esw@10110000 {
ralink,portmap = <0x3e>;
};

Write Preview
Loading…
Cancel
Save