From: Sungbo Eo Date: Fri, 8 May 2020 16:21:06 +0000 (+0900) Subject: ramips: tidy up image subtarget Makefiles X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a5720d327671588e5028694b51fbcb30b510ba44;p=openwrt%2Fstaging%2Fmkresin.git ramips: tidy up image subtarget Makefiles - use tab indent in image build recipes for consistency - harmonize line wrapping Signed-off-by: Sungbo Eo [use different line wrapping for one recipe] Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 69b9b7d7fd..5e281f307d 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -362,8 +362,7 @@ define Device/elecom_wrh-300cr SOC := mt7620n IMAGE_SIZE := 14272k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - elecom-header + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | elecom-header DEVICE_VENDOR := Elecom DEVICE_MODEL := WRH-300CR DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci @@ -604,8 +603,7 @@ define Device/linksys_e1700 SOC := mt7620a IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - umedia-header 0x013326 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | umedia-header 0x013326 DEVICE_VENDOR := Linksys DEVICE_MODEL := E1700 SUPPORTED_DEVICES += e1700 @@ -631,8 +629,7 @@ define Device/netgear_ex2700 IMAGES += factory.bin KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ append-uImage-fakehdr filesystem - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - netgear-dni + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | netgear-dni DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX2700 SUPPORTED_DEVICES += ex2700 @@ -646,8 +643,7 @@ define Device/netgear_ex3700 BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | \ - netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | netgear-chk DEVICE_PACKAGES := kmod-mt76x2 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX3700/EX3800 @@ -661,8 +657,7 @@ define Device/netgear_ex6130 BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | \ - netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | netgear-chk DEVICE_PACKAGES := kmod-mt76x2 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6130 @@ -678,8 +673,7 @@ define Device/netgear_wn3000rp-v3 IMAGES += factory.bin KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ append-uImage-fakehdr filesystem - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - netgear-dni + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | netgear-dni DEVICE_VENDOR := NETGEAR DEVICE_MODEL := WN3000RP DEVICE_VARIANT := v3 @@ -1152,8 +1146,8 @@ define Device/zyxel_keenetic-omni DEVICE_MODEL := Keenetic Omni DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | \ - check-size | zyimage -d 4882 -v "ZyXEL Keenetic Omni" + IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size | \ + zyimage -d 4882 -v "ZyXEL Keenetic Omni" SUPPORTED_DEVICES += kn_rc endef TARGET_DEVICES += zyxel_keenetic-omni @@ -1165,8 +1159,7 @@ define Device/zyxel_keenetic-omni-ii DEVICE_MODEL := Keenetic Omni II DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | \ - check-size | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size | \ zyimage -d 2102034 -v "ZyXEL Keenetic Omni II" SUPPORTED_DEVICES += kn_rf endef @@ -1180,8 +1173,8 @@ define Device/zyxel_keenetic-viva DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ kmod-switch-rtl8366-smi kmod-switch-rtl8367b IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | \ - check-size | zyimage -d 8997 -v "ZyXEL Keenetic Viva" + IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size | \ + zyimage -d 8997 -v "ZyXEL Keenetic Viva" SUPPORTED_DEVICES += kng_rc endef TARGET_DEVICES += zyxel_keenetic-viva diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 88db43cb65..082bb31b79 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -24,61 +24,61 @@ define Build/custom-initramfs-uimage endef define Build/elecom-gst-factory - $(eval product=$(word 1,$(1))) - $(eval version=$(word 2,$(1))) - ( $(STAGING_DIR_HOST)/bin/mkhash md5 $@ | tr -d '\n' ) >> $@ - ( \ - echo -n "ELECOM $(product) v$(version)" | \ - dd bs=32 count=1 conv=sync; \ - dd if=$@; \ - ) > $@.new - mv $@.new $@ - echo -n "MT7621_ELECOM_$(product)" >> $@ + $(eval product=$(word 1,$(1))) + $(eval version=$(word 2,$(1))) + ( $(STAGING_DIR_HOST)/bin/mkhash md5 $@ | tr -d '\n' ) >> $@ + ( \ + echo -n "ELECOM $(product) v$(version)" | \ + dd bs=32 count=1 conv=sync; \ + dd if=$@; \ + ) > $@.new + mv $@.new $@ + echo -n "MT7621_ELECOM_$(product)" >> $@ endef define Build/elecom-wrc-factory - $(eval product=$(word 1,$(1))) - $(eval version=$(word 2,$(1))) - $(STAGING_DIR_HOST)/bin/mkhash md5 $@ >> $@ - ( \ - echo -n "ELECOM $(product) v$(version)" | \ - dd bs=32 count=1 conv=sync; \ - dd if=$@; \ - ) > $@.new - mv $@.new $@ + $(eval product=$(word 1,$(1))) + $(eval version=$(word 2,$(1))) + $(STAGING_DIR_HOST)/bin/mkhash md5 $@ >> $@ + ( \ + echo -n "ELECOM $(product) v$(version)" | \ + dd bs=32 count=1 conv=sync; \ + dd if=$@; \ + ) > $@.new + mv $@.new $@ endef define Build/iodata-factory - $(eval fw_size=$(word 1,$(1))) - $(eval fw_type=$(word 2,$(1))) - $(eval product=$(word 3,$(1))) - $(eval factory_bin=$(word 4,$(1))) - if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) -a "$$(stat -c%s $@)" -lt "$(fw_size)" ]; then \ - $(CP) $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) $(factory_bin); \ - $(STAGING_DIR_HOST)/bin/mksenaofw \ - -r 0x30a -p $(product) -t $(fw_type) \ - -e $(factory_bin) -o $(factory_bin).new; \ - mv $(factory_bin).new $(factory_bin); \ - $(CP) $(factory_bin) $(BIN_DIR)/; \ + $(eval fw_size=$(word 1,$(1))) + $(eval fw_type=$(word 2,$(1))) + $(eval product=$(word 3,$(1))) + $(eval factory_bin=$(word 4,$(1))) + if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) -a "$$(stat -c%s $@)" -lt "$(fw_size)" ]; then \ + $(CP) $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) $(factory_bin); \ + $(STAGING_DIR_HOST)/bin/mksenaofw \ + -r 0x30a -p $(product) -t $(fw_type) \ + -e $(factory_bin) -o $(factory_bin).new; \ + mv $(factory_bin).new $(factory_bin); \ + $(CP) $(factory_bin) $(BIN_DIR)/; \ else \ echo "WARNING: initramfs kernel image too big, cannot generate factory image" >&2; \ fi endef define Build/iodata-mstc-header - ( \ - data_size_crc="$$(dd if=$@ ibs=64 skip=1 2>/dev/null | \ - gzip -c | tail -c 8 | od -An -tx8 --endian little | tr -d ' \n')"; \ - echo -ne "$$(echo $$data_size_crc | sed 's/../\\x&/g')" | \ - dd of=$@ bs=8 count=1 seek=7 conv=notrunc 2>/dev/null; \ - ) - dd if=/dev/zero of=$@ bs=4 count=1 seek=1 conv=notrunc 2>/dev/null - ( \ - header_crc="$$(dd if=$@ bs=64 count=1 2>/dev/null | \ - gzip -c | tail -c 8 | od -An -N4 -tx4 --endian little | tr -d ' \n')"; \ - echo -ne "$$(echo $$header_crc | sed 's/../\\x&/g')" | \ - dd of=$@ bs=4 count=1 seek=1 conv=notrunc 2>/dev/null; \ - ) + ( \ + data_size_crc="$$(dd if=$@ ibs=64 skip=1 2>/dev/null | gzip -c | \ + tail -c 8 | od -An -tx8 --endian little | tr -d ' \n')"; \ + echo -ne "$$(echo $$data_size_crc | sed 's/../\\x&/g')" | \ + dd of=$@ bs=8 count=1 seek=7 conv=notrunc 2>/dev/null; \ + ) + dd if=/dev/zero of=$@ bs=4 count=1 seek=1 conv=notrunc 2>/dev/null + ( \ + header_crc="$$(dd if=$@ bs=64 count=1 2>/dev/null | gzip -c | \ + tail -c 8 | od -An -N4 -tx4 --endian little | tr -d ' \n')"; \ + echo -ne "$$(echo $$header_crc | sed 's/../\\x&/g')" | \ + dd of=$@ bs=4 count=1 seek=1 conv=notrunc 2>/dev/null; \ + ) endef define Build/netis-tail @@ -221,8 +221,8 @@ define Device/dlink_dir-860l-b1 BLOCKSIZE := 64k SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb LOADER_TYPE := bin - KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | \ - relocate-kernel | lzma -a0 | uImage lzma + KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | relocate-kernel | \ + lzma -a0 | uImage lzma IMAGE_SIZE := 16064k DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-860L @@ -454,8 +454,7 @@ TARGET_DEVICES += iptime_a8004t define Device/jcg_jhr-ac876m IMAGE_SIZE := 16064k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - jcg-header 89.1 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | jcg-header 89.1 JCG_MAXSIZE := 16064k DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-AC876M @@ -561,8 +560,7 @@ define Device/netgear_ex6150 NETGEAR_BOARD_ID := U12H318T00_NETGEAR IMAGE_SIZE := 14848k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | \ - netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | netgear-chk endef TARGET_DEVICES += netgear_ex6150 @@ -674,11 +672,10 @@ define Device/netgear_wndr3700-v5 IMAGES += factory.img IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ - check-size + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | \ - pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ - zip WNDR3700v5.bin | sercom-seal + pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip WNDR3700v5.bin | \ + sercom-seal DEVICE_VENDOR := NETGEAR DEVICE_MODEL := WNDR3700 DEVICE_VARIANT := v5 diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 7700265a33..ba8ab1b747 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -34,8 +34,7 @@ TARGET_DEVICES += buffalo_wcr-1166ds define Device/cudy_wr1000 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - jcg-header 92.122 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | jcg-header 92.122 JCG_MAXSIZE := 7872k DEVICE_VENDOR := Cudy DEVICE_MODEL := WR1000 @@ -178,8 +177,7 @@ define Device/netgear_r6120 IMAGES += factory.img IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | \ pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ - check-size + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6120.bin | \ sercom-seal diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk index 79a61860b8..eff5a22030 100644 --- a/target/linux/ramips/image/rt288x.mk +++ b/target/linux/ramips/image/rt288x.mk @@ -53,8 +53,8 @@ define Device/belkin_f5d8235-v1 DEVICE_VENDOR := Belkin DEVICE_MODEL := F5D8235 DEVICE_VARIANT := V1 - DEVICE_PACKAGES := kmod-switch-rtl8366s kmod-usb-ohci \ - kmod-usb-ohci-pci kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-switch-rtl8366s kmod-usb-ohci kmod-usb-ohci-pci \ + kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += f5d8235-v1 endef TARGET_DEVICES += belkin_f5d8235-v1 diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index e90ab630d8..d66f0b3a70 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -2,13 +2,13 @@ # RT305X Profiles # define Build/buffalo-tftp-header - ( \ - echo -n -e "# Airstation FirmWare\nrun u_fw\nreset\n\n" | \ - dd bs=512 count=1 conv=sync; \ - dd if=$@; \ - ) > $@.tmp && \ - $(STAGING_DIR_HOST)/bin/buffalo-tftp -i $@.tmp -o $@.new - mv $@.new $@ + ( \ + echo -n -e "# Airstation FirmWare\nrun u_fw\nreset\n\n" | \ + dd bs=512 count=1 conv=sync; \ + dd if=$@; \ + ) > $@.tmp && \ + $(STAGING_DIR_HOST)/bin/buffalo-tftp -i $@.tmp -o $@.new + mv $@.new $@ endef define Build/dap-header @@ -309,8 +309,7 @@ define Device/buffalo_whr-g300n DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-G300N IMAGES += tftp.bin - IMAGE/tftp.bin := $$(sysupgrade_bin) | check-size | \ - buffalo-tftp-header + IMAGE/tftp.bin := $$(sysupgrade_bin) | check-size | buffalo-tftp-header SUPPORTED_DEVICES += whr-g300n DEFAULT := n endef @@ -588,8 +587,7 @@ define Device/hilink_hlk-rm04 SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - hilink-header + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | hilink-header DEVICE_VENDOR := Hi-Link DEVICE_MODEL := HLK-RM04 SUPPORTED_DEVICES += hlk-rm04 @@ -643,8 +641,7 @@ define Device/jcg_jhr-n805r SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - jcg-header 29.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | jcg-header 29.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N805R SUPPORTED_DEVICES += jhr-n805r @@ -656,8 +653,7 @@ define Device/jcg_jhr-n825r SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - jcg-header 23.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | jcg-header 23.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N825R SUPPORTED_DEVICES += jhr-n825r @@ -669,8 +665,7 @@ define Device/jcg_jhr-n926r SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - jcg-header 25.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | jcg-header 25.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N926R SUPPORTED_DEVICES += jhr-n926r @@ -755,8 +750,7 @@ define Device/nixcore_x1-16m DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink kmod-spi-dev SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-16M endef TARGET_DEVICES += nixcore_x1-16m @@ -767,8 +761,7 @@ define Device/nixcore_x1-8m DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink kmod-spi-dev SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-8M endef TARGET_DEVICES += nixcore_x1-8m @@ -778,8 +771,7 @@ define Device/olimex_rt5350f-olinuxino IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink kmod-spi-dev SUPPORTED_DEVICES += rt5350f-olinuxino endef TARGET_DEVICES += olimex_rt5350f-olinuxino @@ -789,8 +781,7 @@ define Device/olimex_rt5350f-olinuxino-evb IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino-EVB - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink kmod-spi-dev SUPPORTED_DEVICES += rt5350f-olinuxino-evb endef TARGET_DEVICES += olimex_rt5350f-olinuxino-evb @@ -1146,8 +1137,7 @@ define Device/vocore_vocore-16m DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink kmod-spi-dev SUPPORTED_DEVICES += vocore vocore-16M endef TARGET_DEVICES += vocore_vocore-16m @@ -1158,8 +1148,7 @@ define Device/vocore_vocore-8m DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink kmod-spi-dev SUPPORTED_DEVICES += vocore vocore-8M endef TARGET_DEVICES += vocore_vocore-8m diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index a1329c49d5..8f4c22097b 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -112,8 +112,7 @@ define Device/trendnet_tew-691gr BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - umedia-header 0x026910 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | umedia-header 0x026910 DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-691GR SUPPORTED_DEVICES += tew-691gr @@ -125,8 +124,7 @@ define Device/trendnet_tew-692gr BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ - umedia-header 0x026920 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | umedia-header 0x026920 DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-692GR SUPPORTED_DEVICES += tew-692gr