diff options
| author | Rodrigo Araujo <araujo.rm@gmail.com> | 2022-01-18 14:43:28 +0000 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2022-01-22 01:17:04 +0100 |
| commit | 7c8ade1765fa283c253d7c29165be77fcd6a1ff0 (patch) | |
| tree | cfb78787a03fe7a9ef5fa06ed736c6109d4dc45f /target/linux/ramips/image | |
| parent | ef5f3eb7007e950c9a60810a5f421dcfb75cc97f (diff) | |
| download | upstream-7c8ade1765fa283c253d7c29165be77fcd6a1ff0.tar.gz upstream-7c8ade1765fa283c253d7c29165be77fcd6a1ff0.tar.bz2 upstream-7c8ade1765fa283c253d7c29165be77fcd6a1ff0.zip | |
ramips: correct vendor name for COMFAST/Joowin
When Joowin WR758AC V1 and V2 devices were added, they should have been
added with the primary manufacturer name which is COMFAST, since Joowin
is just an alternate vendor name on some coutries or stores.
Fix this by changing the the vendor name on the respective files and set
Joowin as ALT0 variants while ensuring compatibility for early users.
Also adjust the model names to better follow the naming rules.
As a side effect, fix mt76x8 network script which was left incorrectly
unsorted on the case block conditions.
Fixes: 766733e172 ("ramips: add support for Joowin WR758AC V1 and V2")
Signed-off-by: Rodrigo Araujo <araujo.rm@gmail.com>
Diffstat (limited to 'target/linux/ramips/image')
| -rw-r--r-- | target/linux/ramips/image/mt76x8.mk | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 29c2613685..59559c4164 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -79,6 +79,32 @@ define Device/buffalo_wcr-1166ds endef TARGET_DEVICES += buffalo_wcr-1166ds +define Device/comfast_cf-wr758ac + IMAGE_SIZE := 7872k + DEVICE_VENDOR := COMFAST + DEVICE_MODEL := CF-WR758AC + DEVICE_ALT0_VENDOR := Joowin + DEVICE_ALT0_MODEL := JW-WR758AC +endef + +define Device/comfast_cf-wr758ac-v1 + $(Device/comfast_cf-wr758ac) + DEVICE_PACKAGES := kmod-mt76x2 + DEVICE_VARIANT := V1 + DEVICE_ALT0_VARIANT := V1 + SUPPORTED_DEVICES += joowin,jw-wr758ac-v1 +endef +TARGET_DEVICES += comfast_cf-wr758ac-v1 + +define Device/comfast_cf-wr758ac-v2 + $(Device/comfast_cf-wr758ac) + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7663-firmware-ap + DEVICE_VARIANT := V2 + DEVICE_ALT0_VARIANT := V2 + SUPPORTED_DEVICES += joowin,jw-wr758ac-v2 +endef +TARGET_DEVICES += comfast_cf-wr758ac-v2 + define Device/cudy_wr1000 IMAGE_SIZE := 7872k IMAGES += factory.bin @@ -220,26 +246,6 @@ define Device/iptime_a604m endef TARGET_DEVICES += iptime_a604m -define Device/joowin_jw-wr758ac - IMAGE_SIZE := 7872k - DEVICE_VENDOR := Joowin - DEVICE_MODEL := WR758AC -endef - -define Device/joowin_jw-wr758ac-v1 - $(Device/joowin_jw-wr758ac) - DEVICE_PACKAGES := kmod-mt76x2 - DEVICE_VARIANT := V1 -endef -TARGET_DEVICES += joowin_jw-wr758ac-v1 - -define Device/joowin_jw-wr758ac-v2 - $(Device/joowin_jw-wr758ac) - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7663-firmware-ap - DEVICE_VARIANT := V2 -endef -TARGET_DEVICES += joowin_jw-wr758ac-v2 - define Device/jotale_js76x8 DEVICE_VENDOR := Jotale DEVICE_MODEL := JS76x8 |