diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst index 1b63f56b..a7a4cd94 100644 --- a/docs/user/supported_devices.rst +++ b/docs/user/supported_devices.rst @@ -270,6 +270,7 @@ lantiq-xrx200 * AVM + - FRITZ!Box 3370 (Hynix Nand, Micron Nand) [#lan_as_wan]_ - FRITZ!Box 7360 (v1, v2) [#avmflash]_ [#lan_as_wan]_ - FRITZ!Box 7360 SL [#avmflash]_ [#lan_as_wan]_ - FRITZ!Box 7362 SL [#eva_ramboot]_ [#lan_as_wan]_ diff --git a/package/gluon-setup-mode/files/etc/hotplug.d/button/50-gluon-setup-mode b/package/gluon-setup-mode/files/etc/hotplug.d/button/50-gluon-setup-mode index 314f8a43..df596ad8 100755 --- a/package/gluon-setup-mode/files/etc/hotplug.d/button/50-gluon-setup-mode +++ b/package/gluon-setup-mode/files/etc/hotplug.d/button/50-gluon-setup-mode @@ -12,7 +12,8 @@ wait_setup_mode() { } -if [ "$BUTTON" = wps ] || [ "$BUTTON" = reset ] || [ "$BUTTON" = phone ]; then +if [ "$BUTTON" = wps ] || [ "$BUTTON" = reset ] || + [ "$BUTTON" = phone ] || [ "$BUTTON" = power ]; then case "$ACTION" in pressed) wait_setup_mode & diff --git a/patches/openwrt/0010-lantiq-xrx200-show_LAN_activity_on_AVM_3370.patch b/patches/openwrt/0010-lantiq-xrx200-show_LAN_activity_on_AVM_3370.patch new file mode 100644 index 00000000..460a9b8e --- /dev/null +++ b/patches/openwrt/0010-lantiq-xrx200-show_LAN_activity_on_AVM_3370.patch @@ -0,0 +1,24 @@ +From: D. Gathmann +Date: Sat, 06 Jun 2020 14:37:07 +0200 +Subject: lantiq: show LAN activity on AVM Fritzbox 3370 + +This patch changes system.led_lan.trigger to 'netdev' for Fritzbox 3370. +This will configure the LED to show both status and activity on the LAN ports, +as demanded by gluon's Device Integration Checklist. + +Signed-off-by: D. Gathmann + +diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds +index e89de97fbe..3d7d1dc6db 100755 +--- a/target/linux/lantiq/base-files/etc/board.d/01_leds ++++ b/target/linux/lantiq/base-files/etc/board.d/01_leds +@@ -55,7 +55,7 @@ netgear,dm200) + ;; + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron) +- ucidef_set_led_switch "lan" "LAN" "fritz3370:green:lan" "switch0" "0x17" ++ ucidef_set_led_netdev "lan" "LAN" "fritz3370:green:lan" "eth0" + ;; + zyxel,p-2812hnu-f1|\ + zyxel,p-2812hnu-f3) + diff --git a/targets/lantiq-xrx200 b/targets/lantiq-xrx200 index aba9f396..77b9470a 100644 --- a/targets/lantiq-xrx200 +++ b/targets/lantiq-xrx200 @@ -1,3 +1,21 @@ +-- AVM + +device('avm-fritz-box-3370-rev-2-hynix-nand', 'avm_fritz3370-rev2-hynix', { + factory = false, + extra_images = { + {'-squashfs-eva-filesystem', '-eva-filesystem', '.bin'}, + {'-squashfs-eva-kernel', '-eva-kernel', '.bin'}, + }, +}) + +device('avm-fritz-box-3370-rev-2-micron-nand', 'avm_fritz3370-rev2-micron', { + factory = false, + extra_images = { + {'-squashfs-eva-filesystem', '-eva-filesystem', '.bin'}, + {'-squashfs-eva-kernel', '-eva-kernel', '.bin'}, + }, +}) + device('avm-fritz-box-7360-sl', 'avm_fritz7360sl', { factory = false, aliases = {'avm-fritz-box-7360-v1', 'avm-fritz-box-7360-v2'},