From 61ffa851f235d93b9b8c07cd347effc5f2d027a1 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 30 Nov 2018 01:13:05 +0100 Subject: [PATCH 1/3] Prepare FritzBox 4040 base files Signed-off-by: Adrian Schmutzler --- target/linux/ipq40xx/base-files/etc/board.d/01_leds | 2 +- target/linux/ipq40xx/base-files/etc/board.d/02_network | 3 +-- .../ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh | 9 ++++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds index fcba2ae..ceec20d 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds @@ -20,7 +20,7 @@ asus,rt-ac58u) ;; avm,fritzbox-4040) ucidef_set_led_wlan "wlan" "WLAN" "fritz4040:green:wlan" "phy0tpt" "phy1tpt" - ucidef_set_led_netdev "wan" "WAN" "fritz4040:green:wan" "eth1" + ucidef_set_led_switch "wan" "WAN" "fritz4040:green:wan" "switch0" "0x20" ucidef_set_led_switch "lan" "LAN" "fritz4040:green:lan" "switch0" "0x1e" ;; glinet,gl-b1300) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 03e0c0e..016e427 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -26,9 +26,8 @@ asus,rt-ac58u) ucidef_set_interface_macaddr "wan" "$wan_mac_addr" ;; avm,fritzbox-4040) - ucidef_set_interfaces_lan_wan "eth0" "eth1" ucidef_add_switch "switch0" \ - "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" + "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" ;; compex,wpj428) ucidef_set_interface_lan "eth0 eth1" diff --git a/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh b/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh index 1acd736..b845dd4 100644 --- a/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh +++ b/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh @@ -1,6 +1,7 @@ #!/bin/sh -. /lib/functions.sh +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh preinit_set_mac_address() { case $(board_name) in @@ -8,6 +9,12 @@ preinit_set_mac_address() { mac_lan=$(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 102) [ -n "$mac_lan" ] && ip link set dev eth0 address "$mac_lan" ;; + avm,fritzbox-4040) + lan_mac=$(fritz_tffs -b -n maca -i $(find_mtd_part "tffs1")) + wan_mac=$(fritz_tffs -b -n macb -i $(find_mtd_part "tffs1")) + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" + ;; esac } -- 2.7.4