Skip to content

Commit 62833d6

Browse files
committed
lantiq: ar9: buffalo-wbmr-hp-g300h add support for ASU sysupgrades
Add the required two unique dts compatibles to allow correct profile identification when asking for ASU sysupgrades. Keep/add each device dts compatible in the other device's SUPPORTED_DEVICES field to keep the ability to sysupgrade between the two ADSL annex image variants. *Depends on an open PR in the ASU repo. Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>
1 parent db91c68 commit 62833d6

5 files changed

Lines changed: 16 additions & 8 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include "ar9_buffalo_wbmr-hp-g300h.dtsi"
2+
3+
/ {
4+
compatible = "buffalo,wbmr-hp-g300h-a", "lantiq,xway", "lantiq,ar9";
5+
model = "Buffalo WBMR-HP-G300H-a";
6+
};
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include "ar9_buffalo_wbmr-hp-g300h.dtsi"
2+
3+
/ {
4+
compatible = "buffalo,wbmr-hp-g300h-b", "lantiq,xway", "lantiq,ar9";
5+
model = "Buffalo WBMR-HP-G300H-b";
6+
};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts renamed to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dtsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
#include <dt-bindings/leds/common.h>
55

66
/ {
7-
compatible = "buffalo,wbmr-hp-g300h", "lantiq,xway", "lantiq,ar9";
8-
model = "Buffalo WBMR-HP-G300H";
9-
107
chosen {
118
bootargs = "console=ttyLTQ0,115200";
129
};

target/linux/lantiq/image/ar9.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,12 @@ define Device/buffalo_wbmr-hp-g300h-a
5757
DEVICE_VARIANT := A
5858
IMAGE_SIZE := 31488k
5959
SOC := ar9
60-
DEVICE_DTS := ar9_buffalo_wbmr-hp-g300h
6160
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
6261
kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
6362
kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
6463
ltq-adsl-app ppp-mod-pppoa \
6564
kmod-ath9k kmod-owl-loader wpad-basic-mbedtls
66-
SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h
65+
SUPPORTED_DEVICES += WBMR buffalo,wbmr-hp-g300h buffalo,wbmr-hp-g300h-b
6766
endef
6867
TARGET_DEVICES += buffalo_wbmr-hp-g300h-a
6968

@@ -73,13 +72,12 @@ define Device/buffalo_wbmr-hp-g300h-b
7372
DEVICE_VARIANT := B
7473
IMAGE_SIZE := 31488k
7574
SOC := ar9
76-
DEVICE_DTS := ar9_buffalo_wbmr-hp-g300h
7775
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
7876
kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
7977
kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
8078
ltq-adsl-app ppp-mod-pppoa \
8179
kmod-ath9k kmod-owl-loader wpad-basic-mbedtls
82-
SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h
80+
SUPPORTED_DEVICES += WBMR buffalo,wbmr-hp-g300h buffalo,wbmr-hp-g300h-a
8381
endef
8482
TARGET_DEVICES += buffalo_wbmr-hp-g300h-b
8583

target/linux/lantiq/xway/base-files/etc/board.d/02_network

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ lantiq_setup_interfaces()
2020
arcadyan,arv7518pw|\
2121
arcadyan,arv752dpw22|\
2222
arcadyan,arv8539pw22|\
23-
buffalo,wbmr-hp-g300h)
23+
buffalo,wbmr-hp-g300h-a|\
24+
buffalo,wbmr-hp-g300h-b)
2425
ucidef_add_switch "switch0" \
2526
"0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
2627
;;

0 commit comments

Comments
 (0)