From 3b99d6763996d4cf8d59361f25046cc8086da332 Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Mon, 20 Jan 2020 21:19:29 +0100 Subject: ath79: WNDR3700 v2: add dash before version in device name Adapt Netgear WNDR3700v2 device identification string to ath79 naming scheme by changing from 'wndr3700v2' to 'wndr3700-v2' (affects config, makefile, init scripts and device tree definition). Signed-off-by: Michal Cieslakiewicz --- .../linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts | 35 ++++++++++++++++++++++ .../linux/ath79/dts/ar7161_netgear_wndr3700v2.dts | 35 ---------------------- .../generic/base-files/etc/board.d/02_network | 4 +-- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 4 +-- target/linux/ath79/image/generic.mk | 6 ++-- 5 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts delete mode 100644 target/linux/ath79/dts/ar7161_netgear_wndr3700v2.dts diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts new file mode 100644 index 0000000000..f3d27f2bdf --- /dev/null +++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar7161_netgear_wndr3700.dtsi" + +/ { + compatible = "netgear,wndr3700-v2", "qca,ar7161"; + model = "Netgear WNDR3700 v2"; +}; + +&partitions { + partition@0 { + label = "u-boot"; + reg = <0x000000 0x050000>; + read-only; + }; + + partition@50000 { + label = "u-boot-env"; + reg = <0x050000 0x020000>; + read-only; + }; + + partition@70000 { + label = "firmware"; + reg = <0x070000 0xf80000>; + compatible = "netgear,uimage"; + }; + + art: partition@ff0000 { + label = "art"; + reg = <0xff0000 0x010000>; + read-only; + }; +}; diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700v2.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3700v2.dts deleted file mode 100644 index 76ef300a81..0000000000 --- a/target/linux/ath79/dts/ar7161_netgear_wndr3700v2.dts +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; - -#include "ar7161_netgear_wndr3700.dtsi" - -/ { - compatible = "netgear,wndr3700v2", "qca,ar7161"; - model = "Netgear WNDR3700v2"; -}; - -&partitions { - partition@0 { - label = "u-boot"; - reg = <0x000000 0x050000>; - read-only; - }; - - partition@50000 { - label = "u-boot-env"; - reg = <0x050000 0x020000>; - read-only; - }; - - partition@70000 { - label = "firmware"; - reg = <0x070000 0xf80000>; - compatible = "netgear,uimage"; - }; - - art: partition@ff0000 { - label = "art"; - reg = <0xff0000 0x010000>; - read-only; - }; -}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 4630cf8447..f5196be77f 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -180,7 +180,7 @@ ath79_setup_interfaces() "0@eth0" "2:lan" "3:lan" "4:lan" "1:wan" ;; netgear,wndr3700|\ - netgear,wndr3700v2|\ + netgear,wndr3700-v2|\ netgear,wndr3800|\ netgear,wndr3800ch) ucidef_set_interface_wan "eth1" @@ -386,7 +386,7 @@ ath79_setup_macs() label_mac=$wan_mac ;; netgear,wndr3700|\ - netgear,wndr3700v2|\ + netgear,wndr3700-v2|\ netgear,wndr3800) lan_mac=$(macaddr_setbit_la "$(mtd_get_mac_binary art 0x0)") ;; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 7a813b0db1..312acc8684 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -114,7 +114,7 @@ case "$FIRMWARE" in case $board in buffalo,wzr-hp-ag300h|\ netgear,wndr3700|\ - netgear,wndr3700v2|\ + netgear,wndr3700-v2|\ netgear,wndr3800|\ netgear,wndr3800ch) caldata_extract "art" 0x1000 0xeb8 @@ -132,7 +132,7 @@ case "$FIRMWARE" in case $board in buffalo,wzr-hp-ag300h|\ netgear,wndr3700|\ - netgear,wndr3700v2|\ + netgear,wndr3700-v2|\ netgear,wndr3800|\ netgear,wndr3800ch) caldata_extract "art" 0x5000 0xeb8 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 1bc7b2d68e..de12d6dac8 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -819,7 +819,7 @@ define Device/netgear_wndr3700 endef TARGET_DEVICES += netgear_wndr3700 -define Device/netgear_wndr3700v2 +define Device/netgear_wndr3700-v2 $(Device/netgear_wndr3x00) DEVICE_MODEL := WNDR3700 DEVICE_VARIANT := v2 @@ -827,9 +827,9 @@ define Device/netgear_wndr3700v2 NETGEAR_BOARD_ID := WNDR3700v2 NETGEAR_HW_ID := 29763654+16+64 IMAGE_SIZE := 15872k - SUPPORTED_DEVICES += wndr3700 + SUPPORTED_DEVICES += wndr3700 netgear,wndr3700v2 endef -TARGET_DEVICES += netgear_wndr3700v2 +TARGET_DEVICES += netgear_wndr3700-v2 define Device/netgear_wndr3800 $(Device/netgear_wndr3x00) -- cgit v1.2.3