diff --git a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts index 840503933b9..9e4601e0c62 100644 --- a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts +++ b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts @@ -146,19 +146,7 @@ partition@40000 { compatible = "denx,uimage"; label = "firmware"; - reg = <0x040000 0x750000>; - }; - - partition@790000 { - label = "backup"; - reg = <0x790000 0x010000>; - read-only; - }; - - partition@7a0000 { - label = "storage"; - reg = <0x7a0000 0x050000>; - read-only; + reg = <0x040000 0x7b0000>; }; partition@7f0000 { 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 ee8fe2edd11..6be9d44cf8c 100644 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -338,7 +338,6 @@ ath79_setup_interfaces() engenius,esr1200|\ engenius,esr1750|\ engenius,esr900|\ - sitecom,wlr-7100|\ tplink,archer-c2-v3|\ tplink,tl-wr1043nd-v4|\ tplink,tl-wr1043n-v5) @@ -806,11 +805,6 @@ ath79_setup_macs() lan_mac=$(mtd_get_mac_binary board-data 0x807E) label_mac=$lan_mac ;; - sitecom,wlr-7100) - lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) - wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) - label_mac=$lan_mac - ;; sitecom,wlr-8100) wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) ;; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac index cde032c0fd2..0ef322e898e 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac @@ -103,11 +103,6 @@ case "$board" in siemens,ws-ap3610) mtd_get_mac_ascii cfg1 RADIOADDR${PHYNBR} > /sys${DEVPATH}/macaddress ;; - sitecom,wlr-7100) - [ "$PHYNBR" -eq 0 ] && \ - macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" 1 > /sys${DEVPATH}/macaddress - [ "$PHYNBR" -eq 1 ] && \ - macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" > /sys${DEVPATH}/macaddress tplink,deco-s4-v2) base_mac=$(mtd_get_mac_encrypted_deco $(find_mtd_part config)) [ "$PHYNBR" -eq 0 ] && \ diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 26ebdb3b947..b1a37807991 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -3005,19 +3005,6 @@ define Device/siemens_ws-ap3610 endef TARGET_DEVICES += siemens_ws-ap3610 -define Device/sitecom_wlr-7100 - SOC := ar1022 - DEVICE_VENDOR := Sitecom - DEVICE_MODEL := WLR-7100 - DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct-smallbuffers kmod-usb2 - IMAGES += factory.dlf - IMAGE/factory.dlf := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size | \ - senao-header -r 0x222 -p 0x53 -t 2 - IMAGE_SIZE := 7488k -endef -TARGET_DEVICES += sitecom_wlr-7100 - define Device/sitecom_wlr-8100 SOC := qca9558 DEVICE_VENDOR := Sitecom diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index 951c9aa48d3..23d39b9df94 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -187,3 +187,17 @@ define Device/pqi_air-pen DEFAULT := n endef TARGET_DEVICES += pqi_air-pen + +define Device/sitecom_wlr-7100 + SOC := ar1022 + DEVICE_VENDOR := Sitecom + DEVICE_MODEL := WLR-7100 + DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct-smallbuffers kmod-usb2 + BLOCKSIZE := 4k + IMAGES += factory.dlf + IMAGE/factory.dlf := append-kernel | pad-to $$$$(BLOCKSIZE) | \ + append-rootfs | pad-rootfs | check-size | \ + senao-header -r 0x222 -p 0x53 -t 2 + IMAGE_SIZE := 7872k +endef +TARGET_DEVICES += sitecom_wlr-7100 diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/02_network b/target/linux/ath79/tiny/base-files/etc/board.d/02_network index 608b6b7f867..414a36f2d76 100644 --- a/target/linux/ath79/tiny/base-files/etc/board.d/02_network +++ b/target/linux/ath79/tiny/base-files/etc/board.d/02_network @@ -63,7 +63,8 @@ ath79_setup_interfaces() ;; dlink,dir-859-a1|\ dlink,dir-859-a3|\ - dlink,dir-869-a1) + dlink,dir-869-a1|\ + sitecom,wlr-7100) ucidef_add_switch "switch0" \ "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" ;; @@ -163,6 +164,11 @@ ath79_setup_macs() wan_mac=$(mtd_get_mac_binary config 0xc) label_mac=$wan_mac ;; + sitecom,wlr-7100) + lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) + wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) + label_mac=$lan_mac + ;; tplink,tl-wr941-v2|\ tplink,tl-wr941n-v7-cn) base_mac=$(mtd_get_mac_binary u-boot 0x1fc00) diff --git a/target/linux/ath79/tiny/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ath79/tiny/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac index 0a950d8582e..98106853753 100755 --- a/target/linux/ath79/tiny/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac +++ b/target/linux/ath79/tiny/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac @@ -16,4 +16,10 @@ case "$board" in [ "$PHYNBR" -eq 0 ] && \ mtd_get_mac_ascii "nvram" "lan_mac" > /sys${DEVPATH}/macaddress ;; + sitecom,wlr-7100) + [ "$PHYNBR" -eq 0 ] && \ + macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" 1 > /sys${DEVPATH}/macaddress + [ "$PHYNBR" -eq 1 ] && \ + macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" > /sys${DEVPATH}/macaddress + ;; esac