ramips: rename MTK_SOC to SOC

This replaces MTK_SOC by the newly introduced common SOC device variable. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2025-01-19 11:16:32 +00:00 · 2019-12-20 01:15:57 +01:00 · 2019-12-20 01:15:57 +01:00 · 58e71e322b
commit 58e71e322b
parent 95030ac0b6
7 changed files with 320 additions and 321 deletions
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@ -23,9 +23,8 @@ KERNEL_DTB = kernel-bin | append-dtb | lzma
 define Device/Default
  PROFILES = Default
  KERNEL := $(KERNEL_DTB) | uImage lzma
  MTK_SOC :=
  DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS = $$(MTK_SOC)_$(1)
+  DEVICE_DTS = $$(SOC)_$(1)
  IMAGES := sysupgrade.bin
  SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
  sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@ -17,7 +17,7 @@ define Build/elecom-header
 endef
 define Device/aigale_ai-br100
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7936k
  DEVICE_VENDOR := Aigale
  DEVICE_MODEL := Ai-BR100
@ -27,7 +27,7 @@ endef
 TARGET_DEVICES += aigale_ai-br100
 define Device/alfa-network_ac1200rm
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := ALFA Network
  DEVICE_MODEL := AC1200RM
@ -36,7 +36,7 @@ endef
 TARGET_DEVICES += alfa-network_ac1200rm
 define Device/alfa-network_r36m-e4g
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := ALFA Network
  DEVICE_MODEL := R36M-E4G
@ -46,7 +46,7 @@ endef
 TARGET_DEVICES += alfa-network_r36m-e4g
 define Device/alfa-network_tube-e4g
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := ALFA Network
  DEVICE_MODEL := Tube-E4G
@ -65,7 +65,7 @@ define Device/amit_jboot
 endef
 define Device/Archer
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  DEVICE_VENDOR := TP-Link
  TPLINK_HWREVADD := 0
  TPLINK_HVERSION := 3
@ -76,7 +76,7 @@ define Device/Archer
 endef
 define Device/asus_rp-n53
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Asus
  DEVICE_MODEL := RP-N53
@ -86,7 +86,7 @@ endef
 TARGET_DEVICES += asus_rp-n53
 define Device/asus_rt-ac51u
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Asus
  DEVICE_MODEL := RT-AC51U
@ -97,7 +97,7 @@ endef
 TARGET_DEVICES += asus_rt-ac51u
 define Device/asus_rt-n12p
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Asus
  DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
@ -106,7 +106,7 @@ endef
 TARGET_DEVICES += asus_rt-n12p
 define Device/asus_rt-n14u
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Asus
  DEVICE_MODEL := RT-N14u
@ -116,7 +116,7 @@ endef
 TARGET_DEVICES += asus_rt-n14u
 define Device/bdcom_wap2100-sk
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15808k
  DEVICE_VENDOR := BDCOM
  DEVICE_MODEL := WAP2100-SK (ZTE ZXECS EBG3130)
@ -126,7 +126,7 @@ endef
 TARGET_DEVICES += bdcom_wap2100-sk
 define Device/buffalo_whr-1166d
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Buffalo
  DEVICE_MODEL := WHR-1166D
@ -136,7 +136,7 @@ endef
 TARGET_DEVICES += buffalo_whr-1166d
 define Device/buffalo_whr-300hp2
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Buffalo
  DEVICE_MODEL := WHR-300HP2
@ -145,7 +145,7 @@ endef
 TARGET_DEVICES += buffalo_whr-300hp2
 define Device/buffalo_whr-600d
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Buffalo
  DEVICE_MODEL := WHR-600D
@ -155,7 +155,7 @@ endef
 TARGET_DEVICES += buffalo_whr-600d
 define Device/buffalo_wmr-300
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Buffalo
  DEVICE_MODEL := WMR-300
@ -164,7 +164,7 @@ endef
 TARGET_DEVICES += buffalo_wmr-300
 define Device/comfast_cf-wr800n
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Comfast
  DEVICE_MODEL := CF-WR800N
@ -174,7 +174,7 @@ TARGET_DEVICES += comfast_cf-wr800n
 define Device/dlink_dch-m225
  $(Device/seama)
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  BLOCKSIZE := 4k
  SEAMA_SIGNATURE := wapn22_dlink.2013gui_dap1320b
  IMAGE_SIZE := 6848k
@ -187,7 +187,7 @@ TARGET_DEVICES += dlink_dch-m225
 define Device/dlink_dir-510l
  $(Device/amit_jboot)
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 14208k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DIR-510L
@ -200,7 +200,7 @@ endef
 TARGET_DEVICES += dlink_dir-510l
 define Device/dlink_dir-810l
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  DEVICE_PACKAGES := kmod-mt76x0e
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DIR-810L
@ -211,7 +211,7 @@ TARGET_DEVICES += dlink_dir-810l
 define Device/dlink_dwr-116-a1
  $(Device/amit_jboot)
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 8064k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DWR-116
@ -224,7 +224,7 @@ TARGET_DEVICES += dlink_dwr-116-a1
 define Device/dlink_dwr-118-a1
  $(Device/amit_jboot)
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16256k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DWR-118
@ -238,7 +238,7 @@ TARGET_DEVICES += dlink_dwr-118-a1
 define Device/dlink_dwr-118-a2
  $(Device/amit_jboot)
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16256k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DWR-118
@ -252,7 +252,7 @@ TARGET_DEVICES += dlink_dwr-118-a2
 define Device/dlink_dwr-921-c1
  $(Device/amit_jboot)
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 16256k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DWR-921
@ -277,7 +277,7 @@ TARGET_DEVICES += dlink_dwr-921-c3
 define Device/dlink_dwr-922-e2
  $(Device/amit_jboot)
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 16256k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DWR-922
@ -290,7 +290,7 @@ endef
 TARGET_DEVICES += dlink_dwr-922-e2
 define Device/dovado_tiny-ac
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Dovado
  DEVICE_MODEL := Tiny AC
@ -300,7 +300,7 @@ endef
 TARGET_DEVICES += dovado_tiny-ac
 define Device/edimax_br-6478ac-v2
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  DEVICE_VENDOR := Edimax
  DEVICE_MODEL := BR-6478AC
  DEVICE_VARIANT := V2
@ -315,7 +315,7 @@ endef
 TARGET_DEVICES += edimax_br-6478ac-v2
 define Device/edimax_ew-7476rpc
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  DEVICE_VENDOR := Edimax
  DEVICE_MODEL := EW-7476RPC
  BLOCKSIZE := 4k
@ -328,7 +328,7 @@ endef
 TARGET_DEVICES += edimax_ew-7476rpc
 define Device/edimax_ew-7478ac
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  DEVICE_VENDOR := Edimax
  DEVICE_MODEL := EW-7478AC
  BLOCKSIZE := 4k
@ -341,7 +341,7 @@ endef
 TARGET_DEVICES += edimax_ew-7478ac
 define Device/edimax_ew-7478apc
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  DEVICE_VENDOR := Edimax
  DEVICE_MODEL := EW-7478APC
  BLOCKSIZE := 4k
@ -355,7 +355,7 @@ endef
 TARGET_DEVICES += edimax_ew-7478apc
 define Device/elecom_wrh-300cr
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 14272k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -368,7 +368,7 @@ endef
 TARGET_DEVICES += elecom_wrh-300cr
 define Device/engenius_esr600
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  BLOCKSIZE := 64k
  IMAGE_SIZE := 15616k
  IMAGES += factory.dlf
@ -382,7 +382,7 @@ endef
 TARGET_DEVICES += engenius_esr600
 define Device/fon_fon2601
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15936k
  DEVICE_VENDOR := Fon
  DEVICE_MODEL := FON2601
@ -394,7 +394,7 @@ endef
 TARGET_DEVICES += fon_fon2601
 define Device/glinet_gl-mt300a
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := GL.iNet
  DEVICE_MODEL := GL-MT300A
@ -404,7 +404,7 @@ endef
 TARGET_DEVICES += glinet_gl-mt300a
 define Device/glinet_gl-mt300n
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := GL.iNet
  DEVICE_MODEL := GL-MT300N
@ -414,7 +414,7 @@ endef
 TARGET_DEVICES += glinet_gl-mt300n
 define Device/glinet_gl-mt750
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := GL.iNet
  DEVICE_MODEL := GL-MT750
@ -424,7 +424,7 @@ endef
 TARGET_DEVICES += glinet_gl-mt750
 define Device/head-weblink_hdrm200
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Head Weblink
  DEVICE_MODEL := HDRM2000
@ -434,7 +434,7 @@ endef
 TARGET_DEVICES += head-weblink_hdrm200
 define Device/hiwifi_hc5661
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := HiWiFi
  DEVICE_MODEL := HC5661
@ -444,7 +444,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5661
 define Device/hiwifi_hc5761
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := HiWiFi
  DEVICE_MODEL := HC5761
@ -455,7 +455,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5761
 define Device/hiwifi_hc5861
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := HiWiFi
  DEVICE_MODEL := HC5861
@ -466,7 +466,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5861
 define Device/hnet_c108
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := HNET
  DEVICE_MODEL := C108
@ -476,7 +476,7 @@ endef
 TARGET_DEVICES += hnet_c108
 define Device/iodata_wn-ac1167gr
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  DEVICE_VENDOR := I-O DATA
  DEVICE_MODEL := WN-AC1167GR
  IMAGE_SIZE := 6864k
@ -488,7 +488,7 @@ endef
 TARGET_DEVICES += iodata_wn-ac1167gr
 define Device/iodata_wn-ac733gr3
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  DEVICE_VENDOR := I-O DATA
  DEVICE_MODEL := WN-AC733GR3
  IMAGE_SIZE := 6992k
@ -500,7 +500,7 @@ endef
 TARGET_DEVICES += iodata_wn-ac733gr3
 define Device/iptime_a104ns
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 8000k
  UIMAGE_NAME := a104ns
  DEVICE_VENDOR := ipTIME
@ -511,7 +511,7 @@ endef
 TARGET_DEVICES += iptime_a104ns
 define Device/kimax_u25awf-h1
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Kimax
  DEVICE_MODEL := U25AWF
@ -523,7 +523,7 @@ endef
 TARGET_DEVICES += kimax_u25awf-h1
 define Device/kimax_u35wf
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Kimax
  DEVICE_MODEL := U35WF
@ -533,7 +533,7 @@ endef
 TARGET_DEVICES += kimax_u35wf
 define Device/kingston_mlw221
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 15744k
  DEVICE_VENDOR := Kingston
  DEVICE_MODEL := MLW221
@ -543,7 +543,7 @@ endef
 TARGET_DEVICES += kingston_mlw221
 define Device/kingston_mlwg2
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 15744k
  DEVICE_VENDOR := Kingston
  DEVICE_MODEL := MLWG2
@ -554,7 +554,7 @@ TARGET_DEVICES += kingston_mlwg2
 define Device/lava_lr-25g001
  $(Device/amit_jboot)
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16256k
  DEVICE_VENDOR := LAVA
  DEVICE_MODEL := LR-25G001
@ -566,7 +566,7 @@ endef
 TARGET_DEVICES += lava_lr-25g001
 define Device/lenovo_newifi-y1
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Lenovo
  DEVICE_MODEL := Y1
@ -576,7 +576,7 @@ endef
 TARGET_DEVICES += lenovo_newifi-y1
 define Device/lenovo_newifi-y1s
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Lenovo
  DEVICE_MODEL := Y1S
@ -586,7 +586,7 @@ endef
 TARGET_DEVICES += lenovo_newifi-y1s
 define Device/linksys_e1700
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -598,7 +598,7 @@ endef
 TARGET_DEVICES += linksys_e1700
 define Device/microduino_microwrt
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16128k
  DEVICE_VENDOR := Microduino
  DEVICE_MODEL := MicroWRT
@ -608,7 +608,7 @@ endef
 TARGET_DEVICES += microduino_microwrt
 define Device/netgear_ex2700
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  NETGEAR_HW_ID := 29764623+4+0+32+2x2+0
  NETGEAR_BOARD_ID := EX2700
  BLOCKSIZE := 4k
@ -625,7 +625,7 @@ endef
 TARGET_DEVICES += netgear_ex2700
 define Device/netgear_ex3700
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  NETGEAR_BOARD_ID := U12H319T00_NETGEAR
  BLOCKSIZE := 4k
  IMAGE_SIZE := 7744k
@ -640,7 +640,7 @@ endef
 TARGET_DEVICES += netgear_ex3700
 define Device/netgear_ex6130
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  NETGEAR_BOARD_ID := U12H319T50_NETGEAR
  BLOCKSIZE := 4k
  IMAGE_SIZE := 7744k
@ -654,7 +654,7 @@ endef
 TARGET_DEVICES += netgear_ex6130
 define Device/netgear_wn3000rp-v3
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  NETGEAR_HW_ID := 29764836+8+0+32+2x2+0
  NETGEAR_BOARD_ID := WN3000RPv3
@ -672,7 +672,7 @@ endef
 TARGET_DEVICES += netgear_wn3000rp-v3
 define Device/nexx_wt3020-4m
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  BLOCKSIZE := 4k
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
@ -686,7 +686,7 @@ endef
 TARGET_DEVICES += nexx_wt3020-4m
 define Device/nexx_wt3020-8m
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -700,7 +700,7 @@ endef
 TARGET_DEVICES += nexx_wt3020-8m
 define Device/ohyeah_oy-0001
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Oh Yeah
  DEVICE_MODEL := OY-0001
@ -710,7 +710,7 @@ endef
 TARGET_DEVICES += ohyeah_oy-0001
 define Device/phicomm_k2g
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7552k
  DEVICE_VENDOR := Phicomm
  DEVICE_MODEL := K2G
@ -719,7 +719,7 @@ endef
 TARGET_DEVICES += phicomm_k2g
 define Device/phicomm_psg1208
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Phicomm
  DEVICE_MODEL := PSG1208
@ -729,7 +729,7 @@ endef
 TARGET_DEVICES += phicomm_psg1208
 define Device/phicomm_psg1218a
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Phicomm
  DEVICE_MODEL := PSG1218
@ -740,7 +740,7 @@ endef
 TARGET_DEVICES += phicomm_psg1218a
 define Device/phicomm_psg1218b
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Phicomm
  DEVICE_MODEL := PSG1218
@ -751,7 +751,7 @@ endef
 TARGET_DEVICES += phicomm_psg1218b
 define Device/planex_cs-qr10
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Planex
  DEVICE_MODEL := CS-QR10
@ -762,7 +762,7 @@ endef
 TARGET_DEVICES += planex_cs-qr10
 define Device/planex_db-wrt01
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Planex
  DEVICE_MODEL := DB-WRT01
@ -771,7 +771,7 @@ endef
 TARGET_DEVICES += planex_db-wrt01
 define Device/planex_mzk-750dhp
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Planex
  DEVICE_MODEL := MZK-750DHP
@ -781,7 +781,7 @@ endef
 TARGET_DEVICES += planex_mzk-750dhp
 define Device/planex_mzk-ex300np
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7360k
  DEVICE_VENDOR := Planex
  DEVICE_MODEL := MZK-EX300NP
@ -790,7 +790,7 @@ endef
 TARGET_DEVICES += planex_mzk-ex300np
 define Device/planex_mzk-ex750np
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7360k
  DEVICE_VENDOR := Planex
  DEVICE_MODEL := MZK-EX750NP
@ -800,7 +800,7 @@ endef
 TARGET_DEVICES += planex_mzk-ex750np
 define Device/ralink_mt7620a-evb
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := MediaTek
  DEVICE_MODEL := MT7620a EVB
@ -808,7 +808,7 @@ endef
 TARGET_DEVICES += ralink_mt7620a-evb
 define Device/ralink_mt7620a-mt7530-evb
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := MediaTek
  DEVICE_MODEL := MT7620a + MT7530 EVB
@ -817,7 +817,7 @@ endef
 TARGET_DEVICES += ralink_mt7620a-mt7530-evb
 define Device/ralink_mt7620a-mt7610e-evb
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := MediaTek
  DEVICE_MODEL := MT7620a + MT7610e EVB
@ -827,7 +827,7 @@ endef
 TARGET_DEVICES += ralink_mt7620a-mt7610e-evb
 define Device/ralink_mt7620a-v22sg-evb
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 130560k
  DEVICE_VENDOR := MediaTek
  DEVICE_MODEL := MT7620a V22SG
@ -836,7 +836,7 @@ endef
 TARGET_DEVICES += ralink_mt7620a-v22sg-evb
 define Device/ravpower_wd03
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Ravpower
  DEVICE_MODEL := WD03
@ -845,7 +845,7 @@ endef
 TARGET_DEVICES += ravpower_wd03
 define Device/sanlinking_d240
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Sanlinking Technologies
  DEVICE_MODEL := D240
@ -855,7 +855,7 @@ endef
 TARGET_DEVICES += sanlinking_d240
 define Device/sercomm_na930
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 20480k
  DEVICE_VENDOR := Sercomm
  DEVICE_MODEL := NA930
@ -939,7 +939,7 @@ endef
 TARGET_DEVICES += tplink_archer-mr200
 define Device/vonets_var11n-300
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 3776k
  BLOCKSIZE := 4k
  DEVICE_VENDOR := Vonets
@ -948,7 +948,7 @@ endef
 TARGET_DEVICES += vonets_var11n-300
 define Device/wrtnode_wrtnode
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := WRTNode
  DEVICE_MODEL := WRTNode
@ -958,7 +958,7 @@ endef
 TARGET_DEVICES += wrtnode_wrtnode
 define Device/xiaomi_miwifi-mini
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := Xiaomi
  DEVICE_MODEL := MiWiFi Mini
@ -968,7 +968,7 @@ endef
 TARGET_DEVICES += xiaomi_miwifi-mini
 define Device/youku_yk1
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := YOUKU
  DEVICE_MODEL := YK1
@ -979,7 +979,7 @@ endef
 TARGET_DEVICES += youku_yk1
 define Device/yukai_bocco
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := YUKAI Engineering
  DEVICE_MODEL := BOCCO
@ -989,7 +989,7 @@ endef
 TARGET_DEVICES += yukai_bocco
 define Device/zbtlink_zbt-ape522ii
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-APE522II
@ -999,7 +999,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-ape522ii
 define Device/zbtlink_zbt-cpe102
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7552k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-CPE102
@ -1009,7 +1009,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-cpe102
 define Device/zbtlink_zbt-wa05
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7552k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WA05
@ -1019,7 +1019,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wa05
 define Device/zbtlink_zbt-we1026-5g-16m
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE1026-5G
@ -1030,7 +1030,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we1026-5g-16m
 define Device/zbtlink_zbt-we1026-h-32m
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE1026-H
@ -1041,7 +1041,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we1026-h-32m
 define Device/zbtlink_zbt-we2026
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7552k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE2026
@ -1050,7 +1050,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we2026
 define Device/zbtlink_zbt-we826-16m
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE826
@ -1061,7 +1061,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we826-16m
 define Device/zbtlink_zbt-we826-32m
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE826
@ -1072,7 +1072,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we826-32m
 define Device/zbtlink_zbt-we826-e
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE826-E
@ -1082,7 +1082,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we826-e
 define Device/zbtlink_zbt-wr8305rt
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WR8305RT
@ -1092,7 +1092,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wr8305rt
 define Device/zte_q7
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := ZTE
  DEVICE_MODEL := Q7
@ -1102,7 +1102,7 @@ endef
 TARGET_DEVICES += zte_q7
 define Device/zyxel_keenetic-omni
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := ZyXEL
  DEVICE_MODEL := Keenetic Omni
@ -1115,7 +1115,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic-omni
 define Device/zyxel_keenetic-omni-ii
-  MTK_SOC := mt7620n
+  SOC := mt7620n
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := ZyXEL
  DEVICE_MODEL := Keenetic Omni II
@ -1129,7 +1129,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic-omni-ii
 define Device/zyxel_keenetic-viva
-  MTK_SOC := mt7620a
+  SOC := mt7620a
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := ZyXEL
  DEVICE_MODEL := Keenetic Viva
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@ -85,7 +85,7 @@ define Build/wr1201-factory-header
 endef
 define Device/afoundry_ew1200
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := AFOUNDRY
  DEVICE_MODEL := EW1200
@ -96,7 +96,7 @@ endef
 TARGET_DEVICES += afoundry_ew1200
 define Device/alfa-network_quad-e4g
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := ALFA Network
  DEVICE_MODEL := Quad-E4G
@ -106,7 +106,7 @@ endef
 TARGET_DEVICES += alfa-network_quad-e4g
 define Device/asiarf_ap7621-001
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16000k
  DEVICE_VENDOR := AsiaRF
  DEVICE_MODEL := AP7621-001
@ -115,7 +115,7 @@ endef
 TARGET_DEVICES += asiarf_ap7621-001
 define Device/asiarf_ap7621-nv1
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16000k
  DEVICE_VENDOR := AsiaRF
  DEVICE_MODEL := AP7621-NV1
@ -124,7 +124,7 @@ endef
 TARGET_DEVICES += asiarf_ap7621-nv1
 define Device/asus_rt-ac57u
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := ASUS
  DEVICE_MODEL := RT-AC57U
  IMAGE_SIZE := 16064k
@ -134,7 +134,7 @@ endef
 TARGET_DEVICES += asus_rt-ac57u
 define Device/asus_rt-ac65p
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := ASUS
  DEVICE_MODEL := RT-AC65P
  IMAGE_SIZE := 51200k
@ -151,7 +151,7 @@ endef
 TARGET_DEVICES += asus_rt-ac65p
 define Device/asus_rt-ac85p
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := ASUS
  DEVICE_MODEL := RT-AC85P
  IMAGE_SIZE := 51200k
@ -168,7 +168,7 @@ endef
 TARGET_DEVICES += asus_rt-ac85p
 define Device/buffalo_wsr-1166dhp
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
  IMAGE_SIZE := 15936k
  DEVICE_VENDOR := Buffalo
@ -179,7 +179,7 @@ endef
 TARGET_DEVICES += buffalo_wsr-1166dhp
 define Device/buffalo_wsr-600dhp
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Buffalo
  DEVICE_MODEL := WSR-600DHP
@ -190,7 +190,7 @@ TARGET_DEVICES += buffalo_wsr-600dhp
 define Device/dlink_dir-860l-b1
  $(Device/seama)
-  MTK_SOC := mt7621
+  SOC := mt7621
  BLOCKSIZE := 64k
  SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb
  KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma
@ -204,7 +204,7 @@ endef
 TARGET_DEVICES += dlink_dir-860l-b1
 define Device/d-team_newifi-d2
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Newifi
  DEVICE_MODEL := D2
@ -214,7 +214,7 @@ endef
 TARGET_DEVICES += d-team_newifi-d2
 define Device/d-team_pbr-m1
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := PandoraBox
  DEVICE_MODEL := PBR-M1
@ -225,7 +225,7 @@ endef
 TARGET_DEVICES += d-team_pbr-m1
 define Device/edimax_rg21s
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Edimax
  DEVICE_MODEL := Gemini AC2600 RG21S
@ -237,7 +237,7 @@ endef
 TARGET_DEVICES += edimax_rg21s
 define Device/elecom_wrc-1167ghbk2-s
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 15488k
  DEVICE_VENDOR := ELECOM
  DEVICE_MODEL := WRC-1167GHBK2-S
@ -249,7 +249,7 @@ endef
 TARGET_DEVICES += elecom_wrc-1167ghbk2-s
 define Device/elecom_wrc-1900gst
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 11264k
  DEVICE_VENDOR := ELECOM
  DEVICE_MODEL := WRC-1900GST
@ -260,7 +260,7 @@ endef
 TARGET_DEVICES += elecom_wrc-1900gst
 define Device/elecom_wrc-2533gst
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 11264k
  DEVICE_VENDOR := ELECOM
  DEVICE_MODEL := WRC-2533GST
@ -271,7 +271,7 @@ endef
 TARGET_DEVICES += elecom_wrc-2533gst
 define Device/firefly_firewrt
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Firefly
  DEVICE_MODEL := FireWRT
@ -281,7 +281,7 @@ endef
 TARGET_DEVICES += firefly_firewrt
 define Device/gehua_ghl-r-001
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := GeHua
  DEVICE_MODEL := GHL-R-001
@ -291,7 +291,7 @@ endef
 TARGET_DEVICES += gehua_ghl-r-001
 define Device/gnubee_gb-pc1
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := GnuBee
  DEVICE_MODEL := Personal Cloud One
  DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620
@ -300,7 +300,7 @@ endef
 TARGET_DEVICES += gnubee_gb-pc1
 define Device/gnubee_gb-pc2
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := GnuBee
  DEVICE_MODEL := Personal Cloud Two
  DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620
@ -309,7 +309,7 @@ endef
 TARGET_DEVICES += gnubee_gb-pc2
 define Device/hiwifi_hc5962
-  MTK_SOC := mt7621
+  SOC := mt7621
  BLOCKSIZE := 128k
  PAGESIZE := 2048
  KERNEL_SIZE := 2097152
@ -327,7 +327,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5962
 define Device/iodata_wn-ax1167gr
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 15552k
  KERNEL_INITRAMFS := $$(KERNEL) | \
 	iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin
@ -338,7 +338,7 @@ endef
 TARGET_DEVICES += iodata_wn-ax1167gr
 define Device/iodata_wn-gx300gr
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 7616k
  DEVICE_VENDOR := I-O DATA
  DEVICE_MODEL := WN-GX300GR
@ -347,7 +347,7 @@ endef
 TARGET_DEVICES += iodata_wn-gx300gr
 define Device/iodata_wnpr2600g
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := I-O DATA
  DEVICE_MODEL := WNPR2600G
  IMAGE_SIZE := 13952k
@ -359,7 +359,7 @@ endef
 TARGET_DEVICES += iodata_wnpr2600g
 define Device/iptime_a6ns-m
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16128k
  UIMAGE_NAME := a6nm
  DEVICE_VENDOR := ipTIME
@ -369,7 +369,7 @@ endef
 TARGET_DEVICES += iptime_a6ns-m
 define Device/jcg_jhr-ac876m
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -382,7 +382,7 @@ endef
 TARGET_DEVICES += jcg_jhr-ac876m
 define Device/lenovo_newifi-d1
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Newifi
  DEVICE_MODEL := D1
@ -393,7 +393,7 @@ endef
 TARGET_DEVICES += lenovo_newifi-d1
 define Device/linksys_re6500
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Linksys
  DEVICE_MODEL := RE6500
@ -403,7 +403,7 @@ endef
 TARGET_DEVICES += linksys_re6500
 define Device/mediatek_ap-mt7621a-v60
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Mediatek
  DEVICE_MODEL := AP-MT7621A-V60 EVB
@ -412,7 +412,7 @@ endef
 TARGET_DEVICES += mediatek_ap-mt7621a-v60
 define Device/mediatek_mt7621-eval-board
-  MTK_SOC := mt7621
+  SOC := mt7621
  BLOCKSIZE := 64k
  IMAGE_SIZE := 15104k
  DEVICE_VENDOR := MediaTek
@ -422,7 +422,7 @@ endef
 TARGET_DEVICES += mediatek_mt7621-eval-board
 define Device/MikroTik
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := MikroTik
  BLOCKSIZE := 64k
  IMAGE_SIZE := 16128k
@ -456,7 +456,7 @@ endef
 TARGET_DEVICES += mikrotik_rbm33g
 define Device/mqmaker_witi
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := MQmaker
  DEVICE_MODEL := WiTi
@ -467,7 +467,7 @@ endef
 TARGET_DEVICES += mqmaker_witi
 define Device/mtc_wr1201
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16000k
  DEVICE_VENDOR := MTC
  DEVICE_MODEL := Wireless Router WR1201
@ -478,7 +478,7 @@ endef
 TARGET_DEVICES += mtc_wr1201
 define Device/netgear_ex6150
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := NETGEAR
  DEVICE_MODEL := EX6150
  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
@ -491,7 +491,7 @@ endef
 TARGET_DEVICES += netgear_ex6150
 define Device/netgear_sercomm_nand
-  MTK_SOC := mt7621
+  SOC := mt7621
  BLOCKSIZE := 128k
  PAGESIZE := 2048
  KERNEL_SIZE := 4096k
@ -559,7 +559,7 @@ endef
 TARGET_DEVICES += netgear_r6850
 define Device/netgear_wndr3700-v5
-  MTK_SOC := mt7621
+  SOC := mt7621
  BLOCKSIZE := 64k
  IMAGE_SIZE := 15232k
  SERCOMM_HWID := AYB
@ -583,7 +583,7 @@ endef
 TARGET_DEVICES += netgear_wndr3700-v5
 define Device/netis_wf-2881
-  MTK_SOC := mt7621
+  SOC := mt7621
  BLOCKSIZE := 128k
  PAGESIZE := 2048
  FILESYSTEMS := squashfs
@ -600,7 +600,7 @@ endef
 TARGET_DEVICES += netis_wf-2881
 define Device/phicomm_k2p
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 15744k
  DEVICE_VENDOR := Phicomm
  DEVICE_MODEL := K2P
@ -612,7 +612,7 @@ endef
 TARGET_DEVICES += phicomm_k2p
 define Device/planex_vr500
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 65216k
  DEVICE_VENDOR := Planex
  DEVICE_MODEL := VR500
@ -622,7 +622,7 @@ endef
 TARGET_DEVICES += planex_vr500
 define Device/samknows_whitebox-v8
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := SamKnows
  DEVICE_MODEL := Whitebox 8
@ -633,7 +633,7 @@ endef
 TARGET_DEVICES += samknows_whitebox-v8
 define Device/storylink_sap-g3200u3
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := STORYLiNK
  DEVICE_MODEL := SAP-G3200U3
@ -643,7 +643,7 @@ endef
 TARGET_DEVICES += storylink_sap-g3200u3
 define Device/telco-electronics_x1
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Telco Electronics
  DEVICE_MODEL := X1
@ -652,7 +652,7 @@ endef
 TARGET_DEVICES += telco-electronics_x1
 define Device/thunder_timecloud
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Thunder
  DEVICE_MODEL := Timecloud
@ -662,7 +662,7 @@ endef
 TARGET_DEVICES += thunder_timecloud
 define Device/totolink_a7000r
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  UIMAGE_NAME := C8340R1C-9999
  DEVICE_VENDOR := TOTOLINK
@ -672,7 +672,7 @@ endef
 TARGET_DEVICES += totolink_a7000r
 define Device/adslr_g7
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := ADSLR
  DEVICE_MODEL := G7
@ -681,7 +681,7 @@ endef
 TARGET_DEVICES += adslr_g7
 define Device/tplink-safeloader
-  MTK_SOC := mt7621
+  SOC := mt7621
  DEVICE_VENDOR := TP-Link
  TPLINK_BOARD_ID :=
  TPLINK_HWID := 0x0
@ -716,7 +716,7 @@ endef
 TARGET_DEVICES += tplink_re650-v1
 define Device/ubiquiti_edgerouterx
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 256768k
  FILESYSTEMS := squashfs
  KERNEL_SIZE := 3145728
@ -739,7 +739,7 @@ endef
 TARGET_DEVICES += ubiquiti_edgerouterx-sfp
 define Device/unielec_u7621-06-16m
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := UniElec
  DEVICE_MODEL := U7621-06
@ -750,7 +750,7 @@ endef
 TARGET_DEVICES += unielec_u7621-06-16m
 define Device/unielec_u7621-06-64m
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 65216k
  DEVICE_VENDOR := UniElec
  DEVICE_MODEL := U7621-06
@ -761,7 +761,7 @@ endef
 TARGET_DEVICES += unielec_u7621-06-64m
 define Device/wevo_11acnas
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  UIMAGE_NAME := 11AC-NAS-Router(0.0.0)
  DEVICE_VENDOR := WeVO
@ -773,7 +773,7 @@ endef
 TARGET_DEVICES += wevo_11acnas
 define Device/wevo_w2914ns-v2
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  UIMAGE_NAME := W2914NS-V2(0.0.0)
  DEVICE_VENDOR := WeVO
@ -786,7 +786,7 @@ endef
 TARGET_DEVICES += wevo_w2914ns-v2
 define Device/xiaomi_mir3g
-  MTK_SOC := mt7621
+  SOC := mt7621
  BLOCKSIZE := 128k
  PAGESIZE := 2048
  KERNEL_SIZE := 4096k
@ -806,7 +806,7 @@ endef
 TARGET_DEVICES += xiaomi_mir3g
 define Device/xiaomi_mir3g-v2
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 14848k
  DEVICE_VENDOR := Xiaomi
  DEVICE_MODEL := Mi Router 3G
@ -819,7 +819,7 @@ endef
 TARGET_DEVICES += xiaomi_mir3g-v2
 define Device/xiaomi_mir3p
-  MTK_SOC := mt7621
+  SOC := mt7621
  BLOCKSIZE := 128k
  PAGESIZE := 2048
  KERNEL_SIZE:= 4096k
@ -837,7 +837,7 @@ endef
 TARGET_DEVICES += xiaomi_mir3p
 define Device/xiaoyu_xy-c5
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := XiaoYu
  DEVICE_MODEL := XY-C5
@ -846,7 +846,7 @@ endef
 TARGET_DEVICES += xiaoyu_xy-c5
 define Device/xzwifi_creativebox-v1
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := CreativeBox
  DEVICE_MODEL := v1
@ -856,7 +856,7 @@ endef
 TARGET_DEVICES += xzwifi_creativebox-v1
 define Device/youhua_wr1200js
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := YouHua
  DEVICE_MODEL := WR1200JS
@ -866,7 +866,7 @@ endef
 TARGET_DEVICES += youhua_wr1200js
 define Device/youku_yk-l2
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Youku
  DEVICE_MODEL := YK-L2
@ -876,7 +876,7 @@ endef
 TARGET_DEVICES += youku_yk-l2
 define Device/zbtlink_zbt-we1326
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE1326
@ -887,7 +887,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we1326
 define Device/zbtlink_zbt-we3526
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE3526
@ -897,7 +897,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we3526
 define Device/zbtlink_zbt-wg2626
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WG2626
@ -908,7 +908,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wg2626
 define Device/zbtlink_zbt-wg3526-16m
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WG3526
@ -920,7 +920,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wg3526-16m
 define Device/zbtlink_zbt-wg3526-32m
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WG3526
@ -932,7 +932,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wg3526-32m
 define Device/zio_freezio
-  MTK_SOC := mt7621
+  SOC := mt7621
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := ZIO
  DEVICE_MODEL := FREEZIO
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@ -3,7 +3,7 @@
 #
 define Device/alfa-network_awusfree1
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := ALFA Network
  DEVICE_MODEL := AWUSFREE1
@ -12,7 +12,7 @@ endef
 TARGET_DEVICES += alfa-network_awusfree1
 define Device/buffalo_wcr-1166ds
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7936k
  BUFFALO_TAG_PLATFORM := MTK
  BUFFALO_TAG_VERSION := 9.99
@ -30,7 +30,7 @@ endef
 TARGET_DEVICES += buffalo_wcr-1166ds
 define Device/cudy_wr1000
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -44,7 +44,7 @@ endef
 TARGET_DEVICES += cudy_wr1000
 define Device/d-team_pbr-d1
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := PandoraBox
  DEVICE_MODEL := PBR-D1
@ -54,7 +54,7 @@ endef
 TARGET_DEVICES += d-team_pbr-d1
 define Device/duzun_dm06
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := DuZun
  DEVICE_MODEL := DM06
@ -64,7 +64,7 @@ endef
 TARGET_DEVICES += duzun_dm06
 define Device/glinet_gl-mt300n-v2
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := GL.iNet
  DEVICE_MODEL := GL-MT300N
@ -75,7 +75,7 @@ endef
 TARGET_DEVICES += glinet_gl-mt300n-v2
 define Device/glinet_vixmini
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := GL.iNet
  DEVICE_MODEL := VIXMINI
@ -84,7 +84,7 @@ endef
 TARGET_DEVICES += glinet_vixmini
 define Device/hilink_hlk-7628n
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := HILINK
  DEVICE_MODEL := HLK-7628N
@ -92,7 +92,7 @@ endef
 TARGET_DEVICES += hilink_hlk-7628n
 define Device/hiwifi_hc5661a
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 15808k
  DEVICE_VENDOR := HiWiFi
  DEVICE_MODEL := HC5661A
@ -101,7 +101,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5661a
 define Device/hiwifi_hc5761a
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 15808k
  DEVICE_VENDOR := HiWiFi
  DEVICE_MODEL := HC5761A
@ -110,7 +110,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5761a
 define Device/hiwifi_hc5861b
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 15808k
  DEVICE_VENDOR := HiWiFi
  DEVICE_MODEL := HC5861B
@ -119,7 +119,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5861b
 define Device/iptime_a3
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7936k
  UIMAGE_NAME := a3
  DEVICE_VENDOR := ipTIME
@ -129,7 +129,7 @@ endef
 TARGET_DEVICES += iptime_a3
 define Device/iptime_a604m
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7936k
  UIMAGE_NAME := a604m
  DEVICE_VENDOR := ipTIME
@ -139,7 +139,7 @@ endef
 TARGET_DEVICES += iptime_a604m
 define Device/mediatek_linkit-smart-7688
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := MediaTek
  DEVICE_MODEL := LinkIt Smart 7688
@ -149,7 +149,7 @@ endef
 TARGET_DEVICES += mediatek_linkit-smart-7688
 define Device/mediatek_mt7628an-eval-board
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  BLOCKSIZE := 64k
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := MediaTek
@ -160,7 +160,7 @@ endef
 TARGET_DEVICES += mediatek_mt7628an-eval-board
 define Device/mercury_mac1200r-v2
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7936k
  DEVICE_VENDOR := Mercury
  DEVICE_MODEL := MAC1200R
@ -172,7 +172,7 @@ endef
 TARGET_DEVICES += mercury_mac1200r-v2
 define Device/netgear_r6120
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  BLOCKSIZE := 64k
  IMAGE_SIZE := 15744k
  DEVICE_VENDOR := NETGEAR
@ -193,7 +193,7 @@ endef
 TARGET_DEVICES += netgear_r6120
 define Device/onion_omega2
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Onion
  DEVICE_MODEL := Omega2
@ -203,7 +203,7 @@ endef
 TARGET_DEVICES += onion_omega2
 define Device/onion_omega2p
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Onion
  DEVICE_MODEL := Omega2+
@ -213,7 +213,7 @@ endef
 TARGET_DEVICES += onion_omega2p
 define Device/rakwireless_rak633
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Rakwireless
  DEVICE_MODEL := RAK633
@ -222,7 +222,7 @@ endef
 TARGET_DEVICES += rakwireless_rak633
 define Device/skylab_skw92a
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Skylab
  DEVICE_MODEL := SKW92A
@ -231,7 +231,7 @@ endef
 TARGET_DEVICES += skylab_skw92a
 define Device/tama_w06
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 15040k
  DEVICE_VENDOR := Tama
  DEVICE_MODEL := W06
@ -240,7 +240,7 @@ endef
 TARGET_DEVICES += tama_w06
 define Device/totolink_lr1200
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := TOTOLINK
  DEVICE_MODEL := LR1200
@ -249,7 +249,7 @@ endef
 TARGET_DEVICES += totolink_lr1200
 define Device/tplink
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  DEVICE_VENDOR := TP-Link
  TPLINK_FLASHLAYOUT :=
  TPLINK_HWID :=
@ -382,7 +382,7 @@ endef
 TARGET_DEVICES += tplink_tl-wr840n-v4
 define Device/tplink_tl-wr840n-v5
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 3904k
  DEVICE_VENDOR := TP-Link
  DEVICE_MODEL := TL-WR840N
@ -458,7 +458,7 @@ endef
 TARGET_DEVICES += tplink_tl-wr902ac-v3
 define Device/unielec_u7628-01-16m
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := UniElec
  DEVICE_MODEL := U7628-01
@ -469,7 +469,7 @@ endef
 TARGET_DEVICES += unielec_u7628-01-16m
 define Device/vocore_vocore2
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := VoCore
  DEVICE_MODEL := VoCore2
@ -480,7 +480,7 @@ endef
 TARGET_DEVICES += vocore_vocore2
 define Device/vocore_vocore2-lite
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := VoCore
  DEVICE_MODEL := VoCore2-Lite
@ -491,7 +491,7 @@ endef
 TARGET_DEVICES += vocore_vocore2-lite
 define Device/wavlink_wl-wn570ha1
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Wavlink
  DEVICE_MODEL := WL-WN570HA1
@ -500,7 +500,7 @@ endef
 TARGET_DEVICES += wavlink_wl-wn570ha1
 define Device/wavlink_wl-wn575a3
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Wavlink
  DEVICE_MODEL := WL-WN575A3
@ -510,7 +510,7 @@ endef
 TARGET_DEVICES += wavlink_wl-wn575a3
 define Device/widora_neo-16m
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Widora
  DEVICE_MODEL := Widora-NEO
@ -521,7 +521,7 @@ endef
 TARGET_DEVICES += widora_neo-16m
 define Device/widora_neo-32m
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Widora
  DEVICE_MODEL := Widora-NEO
@ -531,7 +531,7 @@ endef
 TARGET_DEVICES += widora_neo-32m
 define Device/wiznet_wizfi630s
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := WIZnet
  DEVICE_MODEL := WizFi630S
@ -539,7 +539,7 @@ endef
 TARGET_DEVICES += wiznet_wizfi630s
 define Device/wrtnode_wrtnode2p
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := WRTnode
  DEVICE_MODEL := WRTnode 2P
@ -549,7 +549,7 @@ endef
 TARGET_DEVICES += wrtnode_wrtnode2p
 define Device/wrtnode_wrtnode2r
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := WRTnode
  DEVICE_MODEL := WRTnode 2R
@ -559,7 +559,7 @@ endef
 TARGET_DEVICES += wrtnode_wrtnode2r
 define Device/xiaomi_mir4a-100m
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 14976k
  DEVICE_VENDOR := Xiaomi
  DEVICE_MODEL := Mi Router 4A
@ -569,7 +569,7 @@ endef
 TARGET_DEVICES += xiaomi_mir4a-100m
 define Device/xiaomi_miwifi-nano
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Xiaomi
  DEVICE_MODEL := MiWiFi Nano
@ -579,7 +579,7 @@ endef
 TARGET_DEVICES += xiaomi_miwifi-nano
 define Device/zbtlink_zbt-we1226
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Zbtlink
  DEVICE_MODEL := ZBT-WE1226
@ -587,7 +587,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we1226
 define Device/zyxel_keenetic-extra-ii
-  MTK_SOC := mt7628an
+  SOC := mt7628an
  IMAGE_SIZE := 14912k
  BLOCKSIZE := 64k
  DEVICE_VENDOR := ZyXEL
--- a/target/linux/ramips/image/rt288x.mk
+++ b/target/linux/ramips/image/rt288x.mk
@ -10,7 +10,7 @@ define Build/gemtek-header
 endef
 define Device/airlink101_ar670w
-  MTK_SOC := rt2880
+  SOC := rt2880
  BLOCKSIZE := 64k
  DEVICE_VENDOR := Airlink
  DEVICE_MODEL := AR670W
@ -24,7 +24,7 @@ endef
 TARGET_DEVICES += airlink101_ar670w
 define Device/airlink101_ar725w
-  MTK_SOC := rt2880
+  SOC := rt2880
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Airlink
  DEVICE_MODEL := AR725W
@ -36,7 +36,7 @@ endef
 TARGET_DEVICES += airlink101_ar725w
 define Device/asus_rt-n15
-  MTK_SOC := rt2880
+  SOC := rt2880
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Asus
@ -47,7 +47,7 @@ endef
 TARGET_DEVICES += asus_rt-n15
 define Device/belkin_f5d8235-v1
-  MTK_SOC := rt2880
+  SOC := rt2880
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Belkin
  DEVICE_MODEL := F5D8235
@ -59,7 +59,7 @@ endef
 TARGET_DEVICES += belkin_f5d8235-v1
 define Device/buffalo_wli-tx4-ag300n
-  MTK_SOC := rt2880
+  SOC := rt2880
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Buffalo
@ -70,7 +70,7 @@ endef
 TARGET_DEVICES += buffalo_wli-tx4-ag300n
 define Device/buffalo_wzr-agl300nh
-  MTK_SOC := rt2880
+  SOC := rt2880
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Buffalo
@ -81,7 +81,7 @@ endef
 TARGET_DEVICES += buffalo_wzr-agl300nh
 define Device/dlink_dap-1522-a1
-  MTK_SOC := rt2880
+  SOC := rt2880
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3712k
  DEVICE_VENDOR := D-Link
@ -97,7 +97,7 @@ endef
 TARGET_DEVICES += dlink_dap-1522-a1
 define Device/ralink_v11st-fe
-  MTK_SOC := rt2880
+  SOC := rt2880
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Ralink
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@ -22,7 +22,7 @@ define Build/hilink-header
 endef
 define Device/7links_px-4885-4m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := 7Links
  DEVICE_MODEL := PX-4885
@ -34,7 +34,7 @@ endef
 TARGET_DEVICES += 7links_px-4885-4m
 define Device/7links_px-4885-8m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := 7Links
  DEVICE_MODEL := PX-4885
@ -46,7 +46,7 @@ endef
 TARGET_DEVICES += 7links_px-4885-8m
 define Device/8devices_carambola
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := 8devices
  DEVICE_MODEL := Carambola
@ -56,7 +56,7 @@ endef
 TARGET_DEVICES += 8devices_carambola
 define Device/accton_wr6202
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Accton
  DEVICE_MODEL := WR6202
@ -65,7 +65,7 @@ endef
 TARGET_DEVICES += accton_wr6202
 define Device/airlive_air3gii
-  MTK_SOC := rt5350
+  SOC := rt5350
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := AirLive
@ -75,7 +75,7 @@ endef
 TARGET_DEVICES += airlive_air3gii
 define Device/alfa-network_w502u
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := ALFA
  DEVICE_MODEL := Networks W502U
@ -84,7 +84,7 @@ endef
 TARGET_DEVICES += alfa-network_w502u
 define Device/allnet_all0256n-4m
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Allnet
  DEVICE_MODEL := ALL0256N
@ -95,7 +95,7 @@ endef
 TARGET_DEVICES += allnet_all0256n-4m
 define Device/allnet_all0256n-8m
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Allnet
  DEVICE_MODEL := ALL0256N
@ -106,7 +106,7 @@ endef
 TARGET_DEVICES += allnet_all0256n-8m
 define Device/allnet_all5002
-  MTK_SOC := rt3352
+  SOC := rt3352
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Allnet
  DEVICE_MODEL := ALL5002
@ -117,7 +117,7 @@ endef
 TARGET_DEVICES += allnet_all5002
 define Device/allnet_all5003
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 32448k
  DEVICE_VENDOR := Allnet
  DEVICE_MODEL := ALL5003
@ -128,7 +128,7 @@ endef
 TARGET_DEVICES += allnet_all5003
 define Device/alphanetworks_asl26555-16m
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 15872k
  DEVICE_VENDOR := Alpha
  DEVICE_MODEL := ASL26555
@ -139,7 +139,7 @@ endef
 TARGET_DEVICES += alphanetworks_asl26555-16m
 define Device/alphanetworks_asl26555-8m
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 7744k
  DEVICE_VENDOR := Alpha
  DEVICE_MODEL := ASL26555
@ -149,7 +149,7 @@ endef
 TARGET_DEVICES += alphanetworks_asl26555-8m
 define Device/arcwireless_freestation5
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := ARC Wireless
  DEVICE_MODEL := FreeStation
@ -160,7 +160,7 @@ endef
 TARGET_DEVICES += arcwireless_freestation5
 define Device/argus_atp-52b
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7808k
  DEVICE_VENDOR := Argus
  DEVICE_MODEL := ATP-52B
@ -169,7 +169,7 @@ endef
 TARGET_DEVICES += argus_atp-52b
 define Device/asiarf_awapn2403
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 4k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := AsiaRF
@ -179,7 +179,7 @@ endef
 TARGET_DEVICES += asiarf_awapn2403
 define Device/asiarf_awm002-evb-4m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := AsiaRF
  DEVICE_MODEL := AWM002-EVB
@ -190,7 +190,7 @@ endef
 TARGET_DEVICES += asiarf_awm002-evb-4m
 define Device/asiarf_awm002-evb-8m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := AsiaRF
  DEVICE_MODEL := AWM002-EVB/AWM003-EVB
@ -201,7 +201,7 @@ endef
 TARGET_DEVICES += asiarf_awm002-evb-8m
 define Device/asus_rt-g32-b1
-  MTK_SOC := rt3050
+  SOC := rt3050
  BLOCKSIZE := 4k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Asus
@ -212,7 +212,7 @@ endef
 TARGET_DEVICES += asus_rt-g32-b1
 define Device/asus_rt-n10-plus
-  MTK_SOC := rt3050
+  SOC := rt3050
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Asus
@ -222,7 +222,7 @@ endef
 TARGET_DEVICES += asus_rt-n10-plus
 define Device/asus_rt-n13u
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Asus
  DEVICE_MODEL := RT-N13U
@ -232,7 +232,7 @@ endef
 TARGET_DEVICES += asus_rt-n13u
 define Device/asus_wl-330n
-  MTK_SOC := rt3050
+  SOC := rt3050
  BLOCKSIZE := 4k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Asus
@ -242,7 +242,7 @@ endef
 TARGET_DEVICES += asus_wl-330n
 define Device/asus_wl-330n3g
-  MTK_SOC := rt3050
+  SOC := rt3050
  BLOCKSIZE := 4k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Asus
@ -253,7 +253,7 @@ endef
 TARGET_DEVICES += asus_wl-330n3g
 define Device/aximcom_mr-102n
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7744k
  DEVICE_VENDOR := AXIMCom
  DEVICE_MODEL := MR-102N
@ -262,7 +262,7 @@ endef
 TARGET_DEVICES += aximcom_mr-102n
 define Device/aztech_hw550-3g
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Aztech
  DEVICE_MODEL := HW550-3G
@ -274,7 +274,7 @@ endef
 TARGET_DEVICES += aztech_hw550-3g
 define Device/belkin_f5d8235-v2
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7744k
  DEVICE_VENDOR := Belkin
  DEVICE_MODEL := F5D8235
@ -285,7 +285,7 @@ endef
 TARGET_DEVICES += belkin_f5d8235-v2
 define Device/belkin_f7c027
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7616k
  DEVICE_VENDOR := Belkin
  DEVICE_MODEL := F7C027
@ -295,7 +295,7 @@ endef
 TARGET_DEVICES += belkin_f7c027
 define Device/buffalo_whr-g300n
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3712k
  DEVICE_VENDOR := Buffalo
@ -308,7 +308,7 @@ endef
 TARGET_DEVICES += buffalo_whr-g300n
 define Device/dlink_dap-1350
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGES += factory.bin factory-NA.bin
  IMAGE_SIZE := 7488k
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -322,7 +322,7 @@ endef
 TARGET_DEVICES += dlink_dap-1350
 define Device/dlink_dcs-930
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DCS-930
@ -333,7 +333,7 @@ endef
 TARGET_DEVICES += dlink_dcs-930
 define Device/dlink_dcs-930l-b1
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DCS-930L
@ -345,7 +345,7 @@ endef
 TARGET_DEVICES += dlink_dcs-930l-b1
 define Device/dlink_dir-300-b1
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -358,7 +358,7 @@ endef
 TARGET_DEVICES += dlink_dir-300-b1
 define Device/dlink_dir-300-b7
-  MTK_SOC := rt5350
+  SOC := rt5350
  BLOCKSIZE := 4k
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := D-Link
@ -369,7 +369,7 @@ endef
 TARGET_DEVICES += dlink_dir-300-b7
 define Device/dlink_dir-320-b1
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DIR-320
@ -379,7 +379,7 @@ endef
 TARGET_DEVICES += dlink_dir-320-b1
 define Device/dlink_dir-600-b1
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -393,7 +393,7 @@ TARGET_DEVICES += dlink_dir-600-b1
 define Device/dlink_dir-610-a1
  $(Device/seama)
-  MTK_SOC := rt5350
+  SOC := rt5350
  BLOCKSIZE := 4k
  SEAMA_SIGNATURE := wrgn59_dlob.hans_dir610
  KERNEL := $(KERNEL_DTB)
@ -407,7 +407,7 @@ endef
 TARGET_DEVICES += dlink_dir-610-a1
 define Device/dlink_dir-615-d
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -420,7 +420,7 @@ endef
 TARGET_DEVICES += dlink_dir-615-d
 define Device/dlink_dir-615-h1
-  MTK_SOC := rt3352
+  SOC := rt3352
  BLOCKSIZE := 4k
  IMAGES += factory.bin
  IMAGE_SIZE := 3776k
@ -433,7 +433,7 @@ endef
 TARGET_DEVICES += dlink_dir-615-h1
 define Device/dlink_dir-620-a1
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DIR-620
@ -443,7 +443,7 @@ endef
 TARGET_DEVICES += dlink_dir-620-a1
 define Device/dlink_dir-620-d1
-  MTK_SOC := rt3352
+  SOC := rt3352
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DIR-620
@ -453,7 +453,7 @@ endef
 TARGET_DEVICES += dlink_dir-620-d1
 define Device/dlink_dwr-512-b
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 8064k
  DEVICE_VENDOR := D-Link
  DEVICE_MODEL := DWR-512
@ -472,7 +472,7 @@ endef
 TARGET_DEVICES += dlink_dwr-512-b
 define Device/easyacc_wizard-8800
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  UIMAGE_NAME:= Linux Kernel Image
  DEVICE_VENDOR := EasyAcc
@ -482,7 +482,7 @@ endef
 TARGET_DEVICES += easyacc_wizard-8800
 define Device/edimax_3g-6200n
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3648k
  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
@ -494,7 +494,7 @@ endef
 TARGET_DEVICES += edimax_3g-6200n
 define Device/edimax_3g-6200nl
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3648k
  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
@ -506,7 +506,7 @@ endef
 TARGET_DEVICES += edimax_3g-6200nl
 define Device/engenius_esr-9753
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := EnGenius
@ -516,7 +516,7 @@ endef
 TARGET_DEVICES += engenius_esr-9753
 define Device/fon_fonera-20n
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | \
@ -529,7 +529,7 @@ endef
 TARGET_DEVICES += fon_fonera-20n
 define Device/hame_mpr-a1
-  MTK_SOC := rt5350
+  SOC := rt5350
  BLOCKSIZE := 4k
  IMAGE_SIZE := 3776k
  UIMAGE_NAME:= Linux Kernel Image
@ -542,7 +542,7 @@ endef
 TARGET_DEVICES += hame_mpr-a1
 define Device/hame_mpr-a2
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  UIMAGE_NAME:= Linux Kernel Image
  DEVICE_VENDOR := HAME
@ -554,7 +554,7 @@ endef
 TARGET_DEVICES += hame_mpr-a2
 define Device/hauppauge_broadway
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7744k
  UIMAGE_NAME:= Broadway Kernel Image
  DEVICE_VENDOR := Hauppauge
@ -565,7 +565,7 @@ endef
 TARGET_DEVICES += hauppauge_broadway
 define Device/hilink_hlk-rm04
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -577,7 +577,7 @@ endef
 TARGET_DEVICES += hilink_hlk-rm04
 define Device/hootoo_ht-tm02
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := HooToo
  DEVICE_MODEL := HT-TM02
@ -587,7 +587,7 @@ endef
 TARGET_DEVICES += hootoo_ht-tm02
 define Device/huawei_d105
-  MTK_SOC := rt3050
+  SOC := rt3050
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Huawei
@ -597,7 +597,7 @@ endef
 TARGET_DEVICES += huawei_d105
 define Device/huawei_hg255d
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 15744k
  DEVICE_VENDOR := HuaWei
  DEVICE_MODEL := HG255D
@ -606,7 +606,7 @@ endef
 TARGET_DEVICES += huawei_hg255d
 define Device/intenso_memory2move
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  UIMAGE_NAME:= Linux Kernel Image
  DEVICE_VENDOR := Intenso
@ -618,7 +618,7 @@ endef
 TARGET_DEVICES += intenso_memory2move
 define Device/jcg_jhr-n805r
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -630,7 +630,7 @@ endef
 TARGET_DEVICES += jcg_jhr-n805r
 define Device/jcg_jhr-n825r
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -642,7 +642,7 @@ endef
 TARGET_DEVICES += jcg_jhr-n825r
 define Device/jcg_jhr-n926r
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -654,7 +654,7 @@ endef
 TARGET_DEVICES += jcg_jhr-n926r
 define Device/mofinetwork_mofi3500-3gn
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := MoFi Network
  DEVICE_MODEL := MOFI3500-3GN
@ -663,7 +663,7 @@ endef
 TARGET_DEVICES += mofinetwork_mofi3500-3gn
 define Device/netcore_nw718
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3712k
  UIMAGE_NAME:= ARA1B4NCRNW718;1
  DEVICE_VENDOR := Netcore
@ -673,7 +673,7 @@ endef
 TARGET_DEVICES += netcore_nw718
 define Device/netgear_wnce2001
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 3392k
  IMAGES += factory.bin factory-NA.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -687,7 +687,7 @@ endef
 TARGET_DEVICES += netgear_wnce2001
 define Device/nexaira_bc2
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := NexAira
  DEVICE_MODEL := BC2
@ -696,7 +696,7 @@ endef
 TARGET_DEVICES += nexaira_bc2
 define Device/nexx_wt1520-4m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -709,7 +709,7 @@ endef
 TARGET_DEVICES += nexx_wt1520-4m
 define Device/nexx_wt1520-8m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -722,7 +722,7 @@ endef
 TARGET_DEVICES += nexx_wt1520-8m
 define Device/nixcore_x1-16m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Nixcore
  DEVICE_MODEL := X1
@ -734,7 +734,7 @@ endef
 TARGET_DEVICES += nixcore_x1-16m
 define Device/nixcore_x1-8m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Nixcore
  DEVICE_MODEL := X1
@ -746,7 +746,7 @@ endef
 TARGET_DEVICES += nixcore_x1-8m
 define Device/olimex_rt5350f-olinuxino
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := OLIMEX
  DEVICE_MODEL := RT5350F-OLinuXino
@ -757,7 +757,7 @@ endef
 TARGET_DEVICES += olimex_rt5350f-olinuxino
 define Device/olimex_rt5350f-olinuxino-evb
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := OLIMEX
  DEVICE_MODEL := RT5350F-OLinuXino-EVB
@ -768,7 +768,7 @@ endef
 TARGET_DEVICES += olimex_rt5350f-olinuxino-evb
 define Device/omnima_miniembplug
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Omnima
  DEVICE_MODEL := MiniEMBPlug
@ -777,7 +777,7 @@ endef
 TARGET_DEVICES += omnima_miniembplug
 define Device/omnima_miniembwifi
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Omnima
  DEVICE_MODEL := MiniEMBWiFi
@ -786,7 +786,7 @@ endef
 TARGET_DEVICES += omnima_miniembwifi
 define Device/petatel_psr-680w
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Petatel
@ -796,7 +796,7 @@ endef
 TARGET_DEVICES += petatel_psr-680w
 define Device/planex_mzk-dp150n
-  MTK_SOC := rt5350
+  SOC := rt5350
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Planex
@ -807,7 +807,7 @@ endef
 TARGET_DEVICES += planex_mzk-dp150n
 define Device/planex_mzk-w300nh2
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 3648k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | \
@ -819,7 +819,7 @@ endef
 TARGET_DEVICES += planex_mzk-w300nh2
 define Device/planex_mzk-wdpr
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 6656k
  DEVICE_VENDOR := Planex
  DEVICE_MODEL := MZK-WDPR
@ -828,7 +828,7 @@ endef
 TARGET_DEVICES += planex_mzk-wdpr
 define Device/poray_ip2202
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Poray
  DEVICE_MODEL := IP2202
@ -837,7 +837,7 @@ endef
 TARGET_DEVICES += poray_ip2202
 define Device/poray_m3
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -850,7 +850,7 @@ endef
 TARGET_DEVICES += poray_m3
 define Device/poray_m4-4m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -864,7 +864,7 @@ endef
 TARGET_DEVICES += poray_m4-4m
 define Device/poray_m4-8m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -878,7 +878,7 @@ endef
 TARGET_DEVICES += poray_m4-8m
 define Device/poray_x5
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -891,7 +891,7 @@ endef
 TARGET_DEVICES += poray_x5
 define Device/poray_x8
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -904,7 +904,7 @@ endef
 TARGET_DEVICES += poray_x8
 define Device/prolink_pwh2004
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Prolink
  DEVICE_MODEL := PWH2004
@ -914,7 +914,7 @@ endef
 TARGET_DEVICES += prolink_pwh2004
 define Device/ralink_v22rw-2x2
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Ralink
@ -924,7 +924,7 @@ endef
 TARGET_DEVICES += ralink_v22rw-2x2
 define Device/sitecom_wl-351
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Sitecom
@ -935,7 +935,7 @@ endef
 TARGET_DEVICES += sitecom_wl-351
 define Device/skyline_sl-r7205
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Skyline
@ -945,7 +945,7 @@ endef
 TARGET_DEVICES += skyline_sl-r7205
 define Device/sparklan_wcr-150gn
-  MTK_SOC := rt3050
+  SOC := rt3050
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Sparklan
@ -955,7 +955,7 @@ endef
 TARGET_DEVICES += sparklan_wcr-150gn
 define Device/teltonika_rut5xx
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Teltonika
  DEVICE_MODEL := RUT5XX
@ -965,7 +965,7 @@ endef
 TARGET_DEVICES += teltonika_rut5xx
 define Device/tenda_3g150b
-  MTK_SOC := rt5350
+  SOC := rt5350
  BLOCKSIZE := 4k
  IMAGE_SIZE := 3776k
  UIMAGE_NAME:= Linux Kernel Image
@ -977,7 +977,7 @@ endef
 TARGET_DEVICES += tenda_3g150b
 define Device/tenda_3g300m
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 3776k
  UIMAGE_NAME := 3G150M_SPI Kernel Image
  DEVICE_VENDOR := Tenda
@ -988,7 +988,7 @@ endef
 TARGET_DEVICES += tenda_3g300m
 define Device/tenda_w150m
-  MTK_SOC := rt3050
+  SOC := rt3050
  IMAGE_SIZE := 3776k
  UIMAGE_NAME:= W150M Kernel Image
  DEVICE_VENDOR := Tenda
@ -998,7 +998,7 @@ endef
 TARGET_DEVICES += tenda_w150m
 define Device/tenda_w306r-v2
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 3776k
  UIMAGE_NAME:= linkn Kernel Image
  DEVICE_VENDOR := Tenda
@ -1009,7 +1009,7 @@ endef
 TARGET_DEVICES += tenda_w306r-v2
 define Device/trendnet_tew-638apb-v2
-  MTK_SOC := rt3050
+  SOC := rt3050
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \
@ -1022,7 +1022,7 @@ endef
 TARGET_DEVICES += trendnet_tew-638apb-v2
 define Device/trendnet_tew-714tru
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := TRENDnet
  DEVICE_MODEL := TEW-714TRU
@ -1031,7 +1031,7 @@ endef
 TARGET_DEVICES += trendnet_tew-714tru
 define Device/unbranded_a5-v11
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  IMAGES += factory.bin
  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@ -1044,7 +1044,7 @@ endef
 TARGET_DEVICES += unbranded_a5-v11
 define Device/unbranded_wr512-3gn-4m
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := Ralink
  DEVICE_MODEL := WR512-3GN
@ -1054,7 +1054,7 @@ endef
 TARGET_DEVICES += unbranded_wr512-3gn-4m
 define Device/unbranded_wr512-3gn-8m
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Ralink
  DEVICE_MODEL := WR512-3GN
@ -1064,7 +1064,7 @@ endef
 TARGET_DEVICES += unbranded_wr512-3gn-8m
 define Device/unbranded_xdx-rn502j
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := XDX
@ -1074,7 +1074,7 @@ endef
 TARGET_DEVICES += unbranded_xdx-rn502j
 define Device/upvel_ur-326n4g
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := UPVEL
@ -1085,7 +1085,7 @@ endef
 TARGET_DEVICES += upvel_ur-326n4g
 define Device/upvel_ur-336un
-  MTK_SOC := rt3052
+  SOC := rt3052
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := UPVEL
  DEVICE_MODEL := UR-336UN
@ -1095,7 +1095,7 @@ endef
 TARGET_DEVICES += upvel_ur-336un
 define Device/vocore_vocore-16m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := VoCore
  DEVICE_MODEL := VoCore
@ -1107,7 +1107,7 @@ endef
 TARGET_DEVICES += vocore_vocore-16m
 define Device/vocore_vocore-8m
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := VoCore
  DEVICE_MODEL := VoCore
@ -1119,7 +1119,7 @@ endef
 TARGET_DEVICES += vocore_vocore-8m
 define Device/wansview_ncs601w
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Wansview
  DEVICE_MODEL := NCS601W
@ -1129,7 +1129,7 @@ endef
 TARGET_DEVICES += wansview_ncs601w
 define Device/wiznet_wizfi630a
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := WIZnet
  DEVICE_MODEL := WizFi630A
@ -1138,7 +1138,7 @@ endef
 TARGET_DEVICES += wiznet_wizfi630a
 define Device/zorlik_zl5900v2
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Zorlik
  DEVICE_MODEL := ZL5900V2
@ -1147,7 +1147,7 @@ endef
 TARGET_DEVICES += zorlik_zl5900v2
 define Device/zyxel_keenetic
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := ZyXEL
@ -1158,7 +1158,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic
 define Device/zyxel_keenetic-start
-  MTK_SOC := rt5350
+  SOC := rt5350
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := ZyXEL
  DEVICE_MODEL := Keenetic Start
@ -1166,7 +1166,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic-start
 define Device/zyxel_nbg-419n
-  MTK_SOC := rt3052
+  SOC := rt3052
  BLOCKSIZE := 64k
  IMAGE_SIZE := 3776k
  DEVICE_VENDOR := ZyXEL
@ -1176,7 +1176,7 @@ endef
 TARGET_DEVICES += zyxel_nbg-419n
 define Device/zyxel_nbg-419n-v2
-  MTK_SOC := rt3352
+  SOC := rt3352
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := ZyXEL
  DEVICE_MODEL := NBG-419N
--- a/target/linux/ramips/image/rt3883.mk
+++ b/target/linux/ramips/image/rt3883.mk
@ -6,7 +6,7 @@ define Build/mkrtn56uimg
 endef
 define Device/asus_rt-n56u
-  MTK_SOC := rt3662
+  SOC := rt3662
  BLOCKSIZE := 64k
  IMAGE_SIZE := 7872k
  IMAGE/sysupgrade.bin += | mkrtn56uimg -s
@ -18,7 +18,7 @@ endef
 TARGET_DEVICES += asus_rt-n56u
 define Device/belkin_f9k1109v1
-  MTK_SOC := rt3883
+  SOC := rt3883
  BLOCKSIZE := 64k
  DEVICE_VENDOR := Belkin
  DEVICE_MODEL := F9K1109
@ -33,7 +33,7 @@ TARGET_DEVICES += belkin_f9k1109v1
 define Device/dlink_dir-645
  $(Device/seama)
-  MTK_SOC := rt3662
+  SOC := rt3662
  BLOCKSIZE := 4k
  IMAGE_SIZE := 7872k
  KERNEL := $(KERNEL_DTB)
@ -46,7 +46,7 @@ endef
 TARGET_DEVICES += dlink_dir-645
 define Device/edimax_br-6475nd
-  MTK_SOC := rt3662
+  SOC := rt3662
  BLOCKSIZE := 64k
  IMAGE_SIZE := 7744k
  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@ -60,7 +60,7 @@ endef
 TARGET_DEVICES += edimax_br-6475nd
 define Device/loewe_wmdr-143n
-  MTK_SOC := rt3662
+  SOC := rt3662
  BLOCKSIZE := 64k
  IMAGE_SIZE := 7872k
  DEVICE_VENDOR := Loewe
@ -70,7 +70,7 @@ endef
 TARGET_DEVICES += loewe_wmdr-143n
 define Device/omnima_hpm
-  MTK_SOC := rt3662
+  SOC := rt3662
  BLOCKSIZE := 64k
  IMAGE_SIZE := 16064k
  DEVICE_VENDOR := Omnima
@ -82,7 +82,7 @@ TARGET_DEVICES += omnima_hpm
 define Device/samsung_cy-swr1100
  $(Device/seama)
-  MTK_SOC := rt3662
+  SOC := rt3662
  BLOCKSIZE := 64k
  IMAGE_SIZE := 7872k
  KERNEL := $(KERNEL_DTB)
@ -95,7 +95,7 @@ endef
 TARGET_DEVICES += samsung_cy-swr1100
 define Device/sitecom_wlr-6000
-  MTK_SOC := rt3883
+  SOC := rt3883
  BLOCKSIZE := 4k
  IMAGE_SIZE := 7244k
  IMAGES += factory.dlf
@ -109,7 +109,7 @@ endef
 TARGET_DEVICES += sitecom_wlr-6000
 define Device/trendnet_tew-691gr
-  MTK_SOC := rt3883
+  SOC := rt3883
  BLOCKSIZE := 64k
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin
@ -123,7 +123,7 @@ endef
 TARGET_DEVICES += trendnet_tew-691gr
 define Device/trendnet_tew-692gr
-  MTK_SOC := rt3883
+  SOC := rt3883
  BLOCKSIZE := 64k
  IMAGE_SIZE := 7872k
  IMAGES += factory.bin