From 1d3ea7874df420ab8d3acbddf5ec9251bf79ed9b Mon Sep 17 00:00:00 2001 From: Daniel Gimpelevich Date: Mon, 6 Aug 2018 10:52:28 -0700 Subject: ramips: fix BR-6478ACv2 support The wholesale changes introduced in commit f9b8328 missed this DTS file because it hadn't been merged yet. This patch brings it in line to match the other mt7620a devices' DTS files. Additionally, the Internet LED is now labeled correctly and set to unused by default, since the WAN interface is not known in every configuration. Using sysupgrade between images before and after this commit will require the -F flag. Tested-by: Rohan Murch Signed-off-by: Daniel Gimpelevich [drop internet led default setting] Signed-off-by: Mathias Kresin --- target/linux/ramips/base-files/etc/board.d/01_leds | 10 ++++------ target/linux/ramips/base-files/etc/board.d/02_network | 18 +++++++++--------- 2 files changed, 13 insertions(+), 15 deletions(-) (limited to 'target/linux/ramips/base-files/etc/board.d') diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 5d833e4410..b64e9d14c5 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -86,12 +86,6 @@ asl26555-16M) bc2) set_usb_led "$boardname:blue:usb" ;; -br-6478ac-v2) - ucidef_set_led_default "power" "POWER" "$boardname:white:power" "1" - ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" "eth0.2" - set_wifi_led "$boardname:blue:wlan" - set_usb_led "$boardname:blue:usb" - ;; broadway) set_usb_led "$boardname:red:diskmounted" set_wifi_led "$boardname:red:wps_active" @@ -185,6 +179,10 @@ vr500) dir-860l-b1) ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2" ;; +edimax,br-6478ac-v2) + set_wifi_led "$boardname:blue:wlan" + set_usb_led "$boardname:blue:usb" + ;; ex2700|\ wn3000rpv3) set_wifi_led "$boardname:green:router" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 28bf815ee9..3ae01448b5 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -283,6 +283,11 @@ ramips_setup_interfaces() ucidef_add_switch "switch1" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" ;; + edimax,br-6478ac-v2|\ + tplink,c2-v1) + ucidef_add_switch "switch1" \ + "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" + ;; hc5*61|\ y1s) ucidef_add_switch "switch0" \ @@ -342,11 +347,6 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0" ;; - br-6478ac-v2|\ - tplink,c2-v1) - ucidef_add_switch "switch1" \ - "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" - ;; tplink,tl-wr902ac-v3) ucidef_add_switch "switch0" \ "4:lan" "6@eth0" @@ -448,10 +448,6 @@ ramips_setup_macs() lan_mac=$(cat /sys/class/net/eth0/address) wan_mac=$(mtd_get_mac_binary devdata 7) ;; - br-6478ac-v2) - lan_mac=$(cat /sys/class/net/eth0/address) - wan_mac=$(macaddr_add "$lan_mac" 2) - ;; cy-swr1100|\ dch-m225) lan_mac=$(mtd_get_mac_ascii factory lanmac) @@ -472,6 +468,10 @@ ramips_setup_macs() e1700) wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR) ;; + edimax,br-6478ac-v2) + lan_mac=$(cat /sys/class/net/eth0/address) + wan_mac=$(macaddr_add "$lan_mac" 2) + ;; elecom,wrc-1167ghbk2-s|\ elecom,wrc-2533gst|\ sk-wb8) -- cgit v1.2.3