EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ramips: provide common definition for ELECOM WRC GS devices

Browse Source 
Add a common definition for ELECOM WRC "GS" devices to mt7621.mk
to not repeat the same assignments five times.

To keep the naming consistent, slightly rename the DTSI and the
factory image recipe as well.

Note that elecom_wrc-1167ghbk2-s uses a slightly different build
recipe for the factory image, so we keep it separate.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: INAGAKI Hiroshi <musashino.open@gmail.com> [WRC-1750GSV]
This commit is contained in:
Adrian Schmutzler 2020-07-15 20:08:22 +02:00
parent a79f55e7e0
commit 95a05b12d7
7 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "mt7621_elecom_wrc-gst.dtsi" #include "mt7621_elecom_wrc-gs.dtsi"
/ { / {
compatible = "elecom,wrc-1750gs", "mediatek,mt7621-soc"; compatible = "elecom,wrc-1750gs", "mediatek,mt7621-soc";

2
target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "mt7621_elecom_wrc-gst.dtsi" #include "mt7621_elecom_wrc-gs.dtsi"
/ { / {
compatible = "elecom,wrc-1750gsv", "mediatek,mt7621-soc"; compatible = "elecom,wrc-1750gsv", "mediatek,mt7621-soc";

2
target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/dts-v1/; /dts-v1/;
#include "mt7621_elecom_wrc-gst.dtsi" #include "mt7621_elecom_wrc-gs.dtsi"
/ { / {
compatible = "elecom,wrc-1900gst", "mediatek,mt7621-soc"; compatible = "elecom,wrc-1900gst", "mediatek,mt7621-soc";

2
target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts
View File

@ -1,6 +1,6 @@
/dts-v1/; /dts-v1/;
#include "mt7621_elecom_wrc-gst.dtsi" #include "mt7621_elecom_wrc-gs.dtsi"
/ { / {
compatible = "elecom,wrc-2533gst", "mediatek,mt7621-soc"; compatible = "elecom,wrc-2533gst", "mediatek,mt7621-soc";

2
target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "mt7621_elecom_wrc-gst.dtsi" #include "mt7621_elecom_wrc-gs.dtsi"
/ { / {
compatible = "elecom,wrc-2533gst2", "mediatek,mt7621-soc"; compatible = "elecom,wrc-2533gst2", "mediatek,mt7621-soc";

0
target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi → target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
View File

49
target/linux/ramips/image/mt7621.mk
View File

@ -7,7 +7,7 @@ include ./common-tp-link.mk
DEFAULT_SOC := mt7621 DEFAULT_SOC := mt7621
KERNEL_DTB += -d21 KERNEL_DTB += -d21
DEVICE_VARS += UIMAGE_MAGIC DEVICE_VARS += UIMAGE_MAGIC ELECOM_HWNAME
# The OEM webinterface expects an kernel with initramfs which has the uImage # The OEM webinterface expects an kernel with initramfs which has the uImage
# header field ih_name. # header field ih_name.
@ -23,7 +23,7 @@ define Build/custom-initramfs-uimage
mv $@.new $@ mv $@.new $@
endef endef
define Build/elecom-gst-factory define Build/elecom-wrc-gs-factory
$(eval product=$(word 1,$(1))) $(eval product=$(word 1,$(1)))
$(eval version=$(word 2,$(1))) $(eval version=$(word 2,$(1)))
( $(STAGING_DIR_HOST)/bin/mkhash md5 $@ | tr -d '\n' ) >> $@ ( $(STAGING_DIR_HOST)/bin/mkhash md5 $@ | tr -d '\n' ) >> $@
@ -326,63 +326,52 @@ define Device/elecom_wrc-1167ghbk2-s
endef endef
TARGET_DEVICES += elecom_wrc-1167ghbk2-s TARGET_DEVICES += elecom_wrc-1167ghbk2-s
define Device/elecom_wrc-1750gs define Device/elecom_wrc-gs
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
IMAGE_SIZE := 11264k
DEVICE_VENDOR := ELECOM DEVICE_VENDOR := ELECOM
DEVICE_MODEL := WRC-1750GS
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
elecom-gst-factory WRC-1750GS 0.00 elecom-wrc-gs-factory $$$$(ELECOM_HWNAME) 0.00
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
endef endef
define Device/elecom_wrc-1750gs
$(Device/elecom_wrc-gs)
IMAGE_SIZE := 11264k
DEVICE_MODEL := WRC-1750GS
ELECOM_HWNAME := WRC-1750GS
endef
TARGET_DEVICES += elecom_wrc-1750gs TARGET_DEVICES += elecom_wrc-1750gs
define Device/elecom_wrc-1750gsv define Device/elecom_wrc-1750gsv
$(Device/uimage-lzma-loader) $(Device/elecom_wrc-gs)
IMAGE_SIZE := 11264k IMAGE_SIZE := 11264k
DEVICE_VENDOR := ELECOM
DEVICE_MODEL := WRC-1750GSV DEVICE_MODEL := WRC-1750GSV
IMAGES += factory.bin ELECOM_HWNAME := WRC-1750GSV
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
elecom-gst-factory WRC-1750GSV 0.00
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
endef endef
TARGET_DEVICES += elecom_wrc-1750gsv TARGET_DEVICES += elecom_wrc-1750gsv
define Device/elecom_wrc-1900gst define Device/elecom_wrc-1900gst
$(Device/uimage-lzma-loader) $(Device/elecom_wrc-gs)
IMAGE_SIZE := 11264k IMAGE_SIZE := 11264k
DEVICE_VENDOR := ELECOM
DEVICE_MODEL := WRC-1900GST DEVICE_MODEL := WRC-1900GST
IMAGES += factory.bin ELECOM_HWNAME := WRC-1900GST
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
elecom-gst-factory WRC-1900GST 0.00
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
endef endef
TARGET_DEVICES += elecom_wrc-1900gst TARGET_DEVICES += elecom_wrc-1900gst
define Device/elecom_wrc-2533gst define Device/elecom_wrc-2533gst
$(Device/uimage-lzma-loader) $(Device/elecom_wrc-gs)
IMAGE_SIZE := 11264k IMAGE_SIZE := 11264k
DEVICE_VENDOR := ELECOM
DEVICE_MODEL := WRC-2533GST DEVICE_MODEL := WRC-2533GST
IMAGES += factory.bin ELECOM_HWNAME := WRC-2533GST
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
elecom-gst-factory WRC-2533GST 0.00
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
endef endef
TARGET_DEVICES += elecom_wrc-2533gst TARGET_DEVICES += elecom_wrc-2533gst
define Device/elecom_wrc-2533gst2 define Device/elecom_wrc-2533gst2
$(Device/uimage-lzma-loader) $(Device/elecom_wrc-gs)
IMAGE_SIZE := 24576k IMAGE_SIZE := 24576k
DEVICE_VENDOR := ELECOM
DEVICE_MODEL := WRC-2533GST2 DEVICE_MODEL := WRC-2533GST2
IMAGES += factory.bin ELECOM_HWNAME := WRC-2533GST2
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
elecom-gst-factory WRC-2533GST2 0.00
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
endef endef
TARGET_DEVICES += elecom_wrc-2533gst2 TARGET_DEVICES += elecom_wrc-2533gst2