From 95030ac0b673165772daf27128359eaaf536d457 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Fri, 20 Dec 2019 01:12:42 +0100
Subject: [PATCH] ath79: rename ATH_SOC to SOC

This replaces ATH_SOC by the newly introduced common SOC device
variable.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 target/linux/ath79/image/Makefile           |   5 +-
 target/linux/ath79/image/generic-tp-link.mk | 100 ++++++-------
 target/linux/ath79/image/generic-ubnt.mk    |  14 +-
 target/linux/ath79/image/generic.mk         | 150 ++++++++++----------
 target/linux/ath79/image/nand.mk            |  12 +-
 target/linux/ath79/image/tiny-netgear.mk    |   6 +-
 target/linux/ath79/image/tiny-tp-link.mk    |  54 +++----
 target/linux/ath79/image/tiny.mk            |   6 +-
 8 files changed, 173 insertions(+), 174 deletions(-)

diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
index 24768ef5e0..34bd0a2490 100644
--- a/target/linux/ath79/image/Makefile
+++ b/target/linux/ath79/image/Makefile
@@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/image.mk
 
 KERNEL_LOADADDR = 0x80060000
 
-DEVICE_VARS += IMAGE_SIZE LOADER_FLASH_OFFS LOADER_TYPE ATH_SOC
+DEVICE_VARS += IMAGE_SIZE LOADER_FLASH_OFFS LOADER_TYPE
 
 define Build/loader-common
 	rm -rf $@.src
@@ -55,9 +55,8 @@ endef
 
 
 define Device/Default
-  ATH_SOC :=
   DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS = $$(ATH_SOC)_$(1)
+  DEVICE_DTS = $$(SOC)_$(1)
   PROFILES = Default
   MTDPARTS :=
   BLOCKSIZE := 64k
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 260e5a37c4..cc5c13b919 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -2,7 +2,7 @@ include ./common-tp-link.mk
 
 define Device/tplink_archer-a7-v5
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15104k
   DEVICE_MODEL := Archer A7
   DEVICE_VARIANT := v5
@@ -16,7 +16,7 @@ TARGET_DEVICES += tplink_archer-a7-v5
 
 define Device/tplink_archer-c2-v3
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C2
   DEVICE_VARIANT := v3
@@ -27,7 +27,7 @@ TARGET_DEVICES += tplink_archer-c2-v3
 
 define Device/tplink_archer-c25-v1
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C25
   DEVICE_VARIANT := v1
@@ -39,7 +39,7 @@ TARGET_DEVICES += tplink_archer-c25-v1
 
 define Device/tplink_archer-c5-v1
   $(Device/tplink-16mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := Archer C5
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
@@ -51,7 +51,7 @@ TARGET_DEVICES += tplink_archer-c5-v1
 
 define Device/tplink_archer-c58-v1
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 7936k
   DEVICE_MODEL := Archer C58
   DEVICE_VARIANT := v1
@@ -63,7 +63,7 @@ TARGET_DEVICES += tplink_archer-c58-v1
 
 define Device/tplink_archer-c59-v1
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 14528k
   DEVICE_MODEL := Archer C59
   DEVICE_VARIANT := v1
@@ -76,7 +76,7 @@ TARGET_DEVICES += tplink_archer-c59-v1
 
 define Device/tplink_archer-c59-v2
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 14400k
   DEVICE_MODEL := Archer C59
   DEVICE_VARIANT := v2
@@ -89,7 +89,7 @@ TARGET_DEVICES += tplink_archer-c59-v2
 
 define Device/tplink_archer-c6-v2
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C6
   DEVICE_VARIANT := v2 (EU/RU/JP)
@@ -100,7 +100,7 @@ TARGET_DEVICES += tplink_archer-c6-v2
 
 define Device/tplink_archer-c6-v2-us
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15872k
   DEVICE_MODEL := Archer C6
   DEVICE_VARIANT := v2 (US)
@@ -114,7 +114,7 @@ TARGET_DEVICES += tplink_archer-c6-v2-us
 
 define Device/tplink_archer-c60-v1
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 7936k
   DEVICE_MODEL := Archer C60
   DEVICE_VARIANT := v1
@@ -126,7 +126,7 @@ TARGET_DEVICES += tplink_archer-c60-v1
 
 define Device/tplink_archer-c60-v2
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C60
   DEVICE_VARIANT := v2
@@ -138,7 +138,7 @@ TARGET_DEVICES += tplink_archer-c60-v2
 
 define Device/tplink_archer-c7-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := Archer C7
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -149,7 +149,7 @@ TARGET_DEVICES += tplink_archer-c7-v1
 
 define Device/tplink_archer-c7-v2
   $(Device/tplink-16mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := Archer C7
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
@@ -164,7 +164,7 @@ TARGET_DEVICES += tplink_archer-c7-v2
 
 define Device/tplink_archer-c7-v4
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15104k
   DEVICE_MODEL := Archer C7
   DEVICE_VARIANT := v4
@@ -178,7 +178,7 @@ TARGET_DEVICES += tplink_archer-c7-v4
 
 define Device/tplink_archer-c7-v5
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15360k
   DEVICE_MODEL := Archer C7
   DEVICE_VARIANT := v5
@@ -191,7 +191,7 @@ endef
 TARGET_DEVICES += tplink_archer-c7-v5
 
 define Device/tplink_archer-d50-v1
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := TP-Link
   DEVICE_MODEL := Archer D50
   DEVICE_VARIANT := v1
@@ -215,7 +215,7 @@ TARGET_DEVICES += tplink_archer-d50-v1
 
 define Device/tplink_cpe210-v1
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE210
   DEVICE_VARIANT := v1
@@ -227,7 +227,7 @@ TARGET_DEVICES += tplink_cpe210-v1
 
 define Device/tplink_cpe210-v2
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9533
+  SOC := qca9533
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE210
   DEVICE_VARIANT := v2
@@ -240,7 +240,7 @@ TARGET_DEVICES += tplink_cpe210-v2
 
 define Device/tplink_cpe210-v3
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9533
+  SOC := qca9533
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE210
   DEVICE_VARIANT := v3
@@ -253,7 +253,7 @@ TARGET_DEVICES += tplink_cpe210-v3
 
 define Device/tplink_cpe220-v2
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE220
   DEVICE_VARIANT := v2
@@ -264,7 +264,7 @@ TARGET_DEVICES += tplink_cpe220-v2
 
 define Device/tplink_cpe220-v3
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9533
+  SOC := qca9533
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE220
   DEVICE_VARIANT := v3
@@ -276,7 +276,7 @@ TARGET_DEVICES += tplink_cpe220-v3
 
 define Device/tplink_cpe510-v1
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE510
   DEVICE_VARIANT := v1
@@ -288,7 +288,7 @@ TARGET_DEVICES += tplink_cpe510-v1
 
 define Device/tplink_cpe510-v2
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE510
   DEVICE_VARIANT := v2
@@ -300,7 +300,7 @@ TARGET_DEVICES += tplink_cpe510-v2
 
 define Device/tplink_cpe510-v3
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE510
   DEVICE_VARIANT := v3
@@ -312,7 +312,7 @@ TARGET_DEVICES += tplink_cpe510-v3
 
 define Device/tplink_cpe610-v1
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE610
   DEVICE_VARIANT := v1
@@ -322,7 +322,7 @@ TARGET_DEVICES += tplink_cpe610-v1
 
 define Device/tplink_re350k-v1
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9558
+  SOC := qca9558
   IMAGE_SIZE := 13760k
   DEVICE_MODEL := RE350K
   DEVICE_VARIANT := v1
@@ -335,7 +335,7 @@ TARGET_DEVICES += tplink_re350k-v1
 
 define Device/tplink_rex5x-v1
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9558
+  SOC := qca9558
   IMAGE_SIZE := 6016k
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
   TPLINK_HWID := 0x0
@@ -362,7 +362,7 @@ TARGET_DEVICES += tplink_re450-v1
 
 define Device/tplink_re450-v2
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 6016k
   DEVICE_MODEL := RE450
   DEVICE_VARIANT := v2
@@ -376,7 +376,7 @@ TARGET_DEVICES += tplink_re450-v2
 
 define Device/tplink_tl-wdr3500-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := TL-WDR3500
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -387,7 +387,7 @@ TARGET_DEVICES += tplink_tl-wdr3500-v1
 
 define Device/tplink_tl-wdr3600-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := TL-WDR3600
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -398,7 +398,7 @@ TARGET_DEVICES += tplink_tl-wdr3600-v1
 
 define Device/tplink_tl-wdr4300-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := TL-WDR4300
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -409,7 +409,7 @@ TARGET_DEVICES += tplink_tl-wdr4300-v1
 
 define Device/tplink_tl-wdr4300-v1-il
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := TL-WDR4300
   DEVICE_VARIANT := v1 (IL)
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -420,7 +420,7 @@ TARGET_DEVICES += tplink_tl-wdr4300-v1-il
 
 define Device/tplink_tl-wdr4900-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WDR4900
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -430,7 +430,7 @@ TARGET_DEVICES += tplink_tl-wdr4900-v2
 
 define Device/tplink_tl-wr1043nd-v1
   $(Device/tplink-8m)
-  ATH_SOC := ar9132
+  SOC := ar9132
   DEVICE_MODEL := TL-WR1043N/ND
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -441,7 +441,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v1
 
 define Device/tplink_tl-wr1043nd-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WR1043N/ND
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -452,7 +452,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v2
 
 define Device/tplink_tl-wr1043nd-v3
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WR1043N/ND
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -463,7 +463,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v3
 
 define Device/tplink_tl-wr1043nd-v4
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15552k
   DEVICE_MODEL := TL-WR1043N/ND
   DEVICE_VARIANT := v4
@@ -476,7 +476,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v4
 
 define Device/tplink_tl-wr1043n-v5
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15104k
   DEVICE_MODEL := TL-WR1043N
   DEVICE_VARIANT := v5
@@ -487,7 +487,7 @@ TARGET_DEVICES += tplink_tl-wr1043n-v5
 
 define Device/tplink_tl-wr1045nd-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WR1045ND
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -497,7 +497,7 @@ TARGET_DEVICES += tplink_tl-wr1045nd-v2
 
 define Device/tplink_tl-wr2543-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar7242
+  SOC := ar7242
   DEVICE_MODEL := TL-WR2543N/ND
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -511,7 +511,7 @@ TARGET_DEVICES += tplink_tl-wr2543-v1
 
 define Device/tplink_tl-wr710n-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_MODEL := TL-WR710N
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
@@ -522,7 +522,7 @@ TARGET_DEVICES += tplink_tl-wr710n-v1
 
 define Device/tplink_tl-wr810n-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_MODEL := TL-WR810N
   DEVICE_VARIANT := v1
   TPLINK_HWID := 0x8100001
@@ -532,7 +532,7 @@ TARGET_DEVICES += tplink_tl-wr810n-v1
 
 define Device/tplink_tl-wr810n-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := TL-WR810N
   DEVICE_VARIANT := v2
   TPLINK_HWID := 0x8100002
@@ -541,7 +541,7 @@ TARGET_DEVICES += tplink_tl-wr810n-v2
 
 define Device/tplink_tl-wr842n-v1
   $(Device/tplink-8m)
-  ATH_SOC := ar7241
+  SOC := ar7241
   DEVICE_MODEL := TL-WR842N/ND
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -551,7 +551,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v1
 
 define Device/tplink_tl-wr842n-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9341
+  SOC := ar9341
   DEVICE_MODEL := TL-WR842N/ND
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -562,7 +562,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v2
 
 define Device/tplink_tl-wr842n-v3
   $(Device/tplink-16mlzma)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := TL-WR842N
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -573,7 +573,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v3
 
 define Device/tplink_tl-wr902ac-v1
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_MODEL := TL-WR902AC
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
@@ -588,7 +588,7 @@ TARGET_DEVICES += tplink_tl-wr902ac-v1
 
 define Device/tplink_wbs210-v2
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := WBS210
   DEVICE_VARIANT := v2
@@ -599,7 +599,7 @@ TARGET_DEVICES += tplink_wbs210-v2
 
 define Device/tplink_wbs510-v1
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := WBS510
   DEVICE_VARIANT := v1
@@ -611,7 +611,7 @@ TARGET_DEVICES += tplink_wbs510-v1
 
 define Device/tplink_wbs510-v2
   $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := WBS510
   DEVICE_VARIANT := v2
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
index 6deff781f7..760d5be196 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -39,7 +39,7 @@ endef
 
 define Device/ubnt-bz
   $(Device/ubnt)
-  ATH_SOC := ar7241
+  SOC := ar7241
   IMAGE_SIZE := 7448k
   UBNT_BOARD := XM
   UBNT_CHIP := ar7240
@@ -49,7 +49,7 @@ endef
 
 define Device/ubnt-wa
   $(Device/ubnt)
-  ATH_SOC := ar9342
+  SOC := ar9342
   IMAGE_SIZE := 15744k
   UBNT_BOARD := WA
   UBNT_CHIP := ar934x
@@ -59,7 +59,7 @@ endef
 
 define Device/ubnt-xm
   $(Device/ubnt)
-  ATH_SOC := ar7241
+  SOC := ar7241
   DEVICE_VARIANT := XM
   DEVICE_PACKAGES += kmod-usb-ohci
   IMAGE_SIZE := 7448k
@@ -72,7 +72,7 @@ endef
 
 define Device/ubnt-xw
   $(Device/ubnt)
-  ATH_SOC := ar9342
+  SOC := ar9342
   DEVICE_VARIANT := XW
   IMAGE_SIZE := 7552k
   UBNT_BOARD := XM
@@ -84,7 +84,7 @@ endef
 
 define Device/ubnt_acb-isp
   $(Device/ubnt)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := airCube ISP
   IMAGE_SIZE := 15744k
   UBNT_BOARD := ACB-ISP
@@ -183,7 +183,7 @@ define Device/ubnt_routerstation_common
   DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci \
 	kmod-usb2 fconfig
   DEVICE_VENDOR := Ubiquiti
-  ATH_SOC := ar7161
+  SOC := ar7161
   IMAGE_SIZE := 16128k
   IMAGES := factory.bin
   IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \
@@ -222,7 +222,7 @@ TARGET_DEVICES += ubnt_unifi
 
 define Device/ubnt_unifiac
   DEVICE_VENDOR := Ubiquiti
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 7744k
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
 endef
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index aa30c7c762..10bd40abc1 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -91,7 +91,7 @@ endef
 
 
 define Device/8dev_carambola2
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_VENDOR := 8devices
   DEVICE_MODEL := Carambola2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2
@@ -101,7 +101,7 @@ endef
 TARGET_DEVICES += 8dev_carambola2
 
 define Device/adtran_bsap1880
-  ATH_SOC := ar7161
+  SOC := ar7161
   DEVICE_VENDOR := Adtran/Bluesocket
   DEVICE_PACKAGES += -swconfig -uboot-envtools fconfig
   KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
@@ -128,7 +128,7 @@ endef
 TARGET_DEVICES += adtran_bsap1840
 
 define Device/alfa-network_ap121f
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_VENDOR := ALFA Network
   DEVICE_MODEL := AP121F
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2 kmod-usb-storage -swconfig
@@ -138,7 +138,7 @@ endef
 TARGET_DEVICES += alfa-network_ap121f
 
 define Device/aruba_ap-105
-  ATH_SOC := ar7161
+  SOC := ar7161
   DEVICE_VENDOR := Aruba
   DEVICE_MODEL := AP-105
   IMAGE_SIZE := 16000k
@@ -147,7 +147,7 @@ endef
 TARGET_DEVICES += aruba_ap-105
 
 define Device/avm_fritz300e
-  ATH_SOC := ar7242
+  SOC := ar7242
   DEVICE_VENDOR := AVM
   DEVICE_MODEL := FRITZ!WLAN Repeater 300E
   KERNEL := kernel-bin | append-dtb | lzma | eva-image
@@ -161,7 +161,7 @@ endef
 TARGET_DEVICES += avm_fritz300e
 
 define Device/avm_fritz4020
-  ATH_SOC := qca9561
+  SOC := qca9561
   DEVICE_VENDOR := AVM
   DEVICE_MODEL := FRITZ!Box 4020
   IMAGE_SIZE := 15232k
@@ -176,7 +176,7 @@ endef
 TARGET_DEVICES += avm_fritz4020
 
 define Device/buffalo_bhr-4grv
-  ATH_SOC := ar7242
+  SOC := ar7242
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := BHR-4GRV
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -192,7 +192,7 @@ endef
 TARGET_DEVICES += buffalo_bhr-4grv
 
 define Device/buffalo_bhr-4grv2
-  ATH_SOC := qca9557
+  SOC := qca9557
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := BHR-4GRV2
   IMAGE_SIZE := 16000k
@@ -200,7 +200,7 @@ endef
 TARGET_DEVICES += buffalo_bhr-4grv2
 
 define Device/buffalo_wzr-hp-ag300h
-  ATH_SOC := ar7161
+  SOC := ar7161
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WZR-HP-AG300H
   IMAGE_SIZE := 32320k
@@ -217,7 +217,7 @@ endef
 TARGET_DEVICES += buffalo_wzr-hp-ag300h
 
 define Device/buffalo_wzr-hp-g302h-a1a0
-  ATH_SOC := ar7242
+  SOC := ar7242
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WZR-HP-G302H
   DEVICE_VARIANT := A1A0
@@ -234,7 +234,7 @@ endef
 TARGET_DEVICES += buffalo_wzr-hp-g302h-a1a0
 
 define Device/buffalo_wzr-hp-g450h
-  ATH_SOC := ar7242
+  SOC := ar7242
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WZR-HP-G450H/WZR-450HP
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -250,7 +250,7 @@ endef
 TARGET_DEVICES += buffalo_wzr-hp-g450h
 
 define Device/comfast_cf-e110n-v2
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_VENDOR := COMFAST
   DEVICE_MODEL := CF-E110N
   DEVICE_VARIANT := v2
@@ -260,7 +260,7 @@ endef
 TARGET_DEVICES += comfast_cf-e110n-v2
 
 define Device/comfast_cf-e120a-v3
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := COMFAST
   DEVICE_MODEL := CF-E120A
   DEVICE_VARIANT := v3
@@ -270,7 +270,7 @@ endef
 TARGET_DEVICES += comfast_cf-e120a-v3
 
 define Device/comfast_cf-e313ac
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := COMFAST
   DEVICE_MODEL := CF-E313AC
   DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-ath10k-ct \
@@ -280,7 +280,7 @@ endef
 TARGET_DEVICES += comfast_cf-e313ac
 
 define Device/comfast_cf-e314n-v2
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := COMFAST
   DEVICE_MODEL := CF-E314N
   DEVICE_VARIANT := v2
@@ -290,7 +290,7 @@ endef
 TARGET_DEVICES += comfast_cf-e314n-v2
 
 define Device/comfast_cf-e5
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := COMFAST
   DEVICE_MODEL := CF-E5/E7
   DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-usb2 kmod-usb-net \
@@ -300,7 +300,7 @@ endef
 TARGET_DEVICES += comfast_cf-e5
 
 define Device/comfast_cf-wr650ac-v1
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := COMFAST
   DEVICE_MODEL := CF-WR650AC
   DEVICE_VARIANT := v1
@@ -310,7 +310,7 @@ endef
 TARGET_DEVICES += comfast_cf-wr650ac-v1
 
 define Device/comfast_cf-wr650ac-v2
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := COMFAST
   DEVICE_MODEL := CF-WR650AC
   DEVICE_VARIANT := v2
@@ -320,7 +320,7 @@ endef
 TARGET_DEVICES += comfast_cf-wr650ac-v2
 
 define Device/devolo_dvl1200e
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := devolo
   DEVICE_MODEL := WiFi pro 1200e
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -329,7 +329,7 @@ endef
 TARGET_DEVICES += devolo_dvl1200e
 
 define Device/devolo_dvl1200i
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := devolo
   DEVICE_MODEL := WiFi pro 1200i
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -338,7 +338,7 @@ endef
 TARGET_DEVICES += devolo_dvl1200i
 
 define Device/devolo_dvl1750c
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := devolo
   DEVICE_MODEL := WiFi pro 1750c
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -347,7 +347,7 @@ endef
 TARGET_DEVICES += devolo_dvl1750c
 
 define Device/devolo_dvl1750e
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := devolo
   DEVICE_MODEL := WiFi pro 1750e
   DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -356,7 +356,7 @@ endef
 TARGET_DEVICES += devolo_dvl1750e
 
 define Device/devolo_dvl1750i
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := devolo
   DEVICE_MODEL := WiFi pro 1750i
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -365,7 +365,7 @@ endef
 TARGET_DEVICES += devolo_dvl1750i
 
 define Device/devolo_dvl1750x
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := devolo
   DEVICE_MODEL := WiFi pro 1750x
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -374,7 +374,7 @@ endef
 TARGET_DEVICES += devolo_dvl1750x
 
 define Device/dlink_dir-825-b1
-  ATH_SOC := ar7161
+  SOC := ar7161
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-825
   DEVICE_VARIANT := B1
@@ -388,7 +388,7 @@ endef
 TARGET_DEVICES += dlink_dir-825-b1
 
 define Device/dlink_dir-825-c1
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-825
   DEVICE_VARIANT := C1
@@ -407,7 +407,7 @@ endef
 TARGET_DEVICES += dlink_dir-825-c1
 
 define Device/dlink_dir-835-a1
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-835
   DEVICE_VARIANT := A1
@@ -425,7 +425,7 @@ endef
 TARGET_DEVICES += dlink_dir-835-a1
 
 define Device/dlink_dir-842-c
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-842
   KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma
@@ -468,7 +468,7 @@ TARGET_DEVICES += dlink_dir-842-c3
 
 define Device/dlink_dir-859-a1
   $(Device/seama)
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-859
   DEVICE_VARIANT := A1
@@ -480,7 +480,7 @@ endef
 TARGET_DEVICES += dlink_dir-859-a1
 
 define Device/elecom_wrc-1750ghbk2-i
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := ELECOM
   DEVICE_MODEL := WRC-1750GHBK2-I/C
   IMAGE_SIZE := 15808k
@@ -491,7 +491,7 @@ endef
 TARGET_DEVICES += elecom_wrc-1750ghbk2-i
 
 define Device/elecom_wrc-300ghbk2-i
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := ELECOM
   DEVICE_MODEL := WRC-300GHBK2-I
   IMAGE_SIZE := 7616k
@@ -501,7 +501,7 @@ endef
 TARGET_DEVICES += elecom_wrc-300ghbk2-i
 
 define Device/embeddedwireless_dorin
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_VENDOR := Embedded Wireless
   DEVICE_MODEL := Dorin
   DEVICE_PACKAGES := kmod-usb-chipidea2
@@ -510,7 +510,7 @@ endef
 TARGET_DEVICES += embeddedwireless_dorin
 
 define Device/engenius_ecb1750
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := EnGenius
   DEVICE_MODEL := ECB1750
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -524,7 +524,7 @@ endef
 TARGET_DEVICES += engenius_ecb1750
 
 define Device/engenius_epg5000
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := EnGenius
   DEVICE_MODEL := EPG5000
   DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct kmod-usb2
@@ -538,7 +538,7 @@ endef
 TARGET_DEVICES += engenius_epg5000
 
 define Device/engenius_ews511ap
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := EnGenius
   DEVICE_MODEL := EWS511AP
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct
@@ -547,7 +547,7 @@ endef
 TARGET_DEVICES += engenius_ews511ap
 
 define Device/etactica_eg200
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_VENDOR := eTactica
   DEVICE_MODEL := EG200
   DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-ledtrig-oneshot \
@@ -558,7 +558,7 @@ endef
 TARGET_DEVICES += etactica_eg200
 
 define Device/glinet_gl-ar150
-  ATH_SOC := ar9330
+  SOC := ar9330
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-AR150
   DEVICE_PACKAGES := kmod-usb-chipidea2
@@ -568,7 +568,7 @@ endef
 TARGET_DEVICES += glinet_gl-ar150
 
 define Device/glinet_gl-ar300m-common-nor
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := GL.iNet
   DEVICE_PACKAGES := kmod-usb2
   IMAGE_SIZE := 16000k
@@ -589,7 +589,7 @@ endef
 TARGET_DEVICES += glinet_gl-ar300m16
 
 define Device/glinet_gl-ar750
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-AR750
   DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct
@@ -599,7 +599,7 @@ endef
 TARGET_DEVICES += glinet_gl-ar750
 
 define Device/glinet_gl-x750
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-X750
   DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct
@@ -608,7 +608,7 @@ endef
 TARGET_DEVICES += glinet_gl-x750
 
 define Device/iodata_etg3-r
-  ATH_SOC := ar9342
+  SOC := ar9342
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := ETG3-R
   IMAGE_SIZE := 7680k
@@ -617,7 +617,7 @@ endef
 TARGET_DEVICES += iodata_etg3-r
 
 define Device/iodata_wn-ac1167dgr
-  ATH_SOC := qca9557
+  SOC := qca9557
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := WN-AC1167DGR
   IMAGE_SIZE := 14656k
@@ -630,7 +630,7 @@ endef
 TARGET_DEVICES += iodata_wn-ac1167dgr
 
 define Device/iodata_wn-ac1600dgr
-  ATH_SOC := qca9557
+  SOC := qca9557
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := WN-AC1600DGR
   IMAGE_SIZE := 14656k
@@ -643,7 +643,7 @@ endef
 TARGET_DEVICES += iodata_wn-ac1600dgr
 
 define Device/iodata_wn-ac1600dgr2
-  ATH_SOC := qca9557
+  SOC := qca9557
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := WN-AC1600DGR2/DGR3
   IMAGE_SIZE := 14656k
@@ -656,7 +656,7 @@ endef
 TARGET_DEVICES += iodata_wn-ac1600dgr2
 
 define Device/iodata_wn-ag300dgr
-  ATH_SOC := ar1022
+  SOC := ar1022
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := WN-AG300DGR
   IMAGE_SIZE := 15424k
@@ -669,7 +669,7 @@ endef
 TARGET_DEVICES += iodata_wn-ag300dgr
 
 define Device/jjplus_ja76pf2
-  ATH_SOC := ar7161
+  SOC := ar7161
   DEVICE_VENDOR := jjPlus
   DEVICE_MODEL := JA76PF2
   DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-mini -uboot-envtools fconfig
@@ -684,7 +684,7 @@ endef
 TARGET_DEVICES += jjplus_ja76pf2
 
 define Device/librerouter_librerouter-v1
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := Librerouter
   DEVICE_MODEL := LibreRouter
   DEVICE_VARIANT := v1
@@ -694,7 +694,7 @@ endef
 TARGET_DEVICES += librerouter_librerouter-v1
 
 define Device/nec_wg1200cr
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := NEC
   DEVICE_MODEL := Aterm WG1200CR
   IMAGE_SIZE := 7616k
@@ -711,7 +711,7 @@ endef
 TARGET_DEVICES += nec_wg1200cr
 
 define Device/nec_wg800hp
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := NEC
   DEVICE_MODEL := Aterm WG800HP
   IMAGE_SIZE := 7104k
@@ -724,7 +724,7 @@ endef
 TARGET_DEVICES += nec_wg800hp
 
 define Device/netgear_ex6400_ex7300
-  ATH_SOC := qca9558
+  SOC := qca9558
   NETGEAR_KERNEL_MAGIC := 0x27051956
   NETGEAR_BOARD_ID := EX7300series
   NETGEAR_HW_ID := 29765104+16+0+128
@@ -748,7 +748,7 @@ endef
 TARGET_DEVICES += netgear_ex7300
 
 define Device/netgear_wndr3x00
-  ATH_SOC := ar7161
+  SOC := ar7161
   IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \
 	append-rootfs | pad-rootfs
   DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
@@ -805,7 +805,7 @@ endef
 TARGET_DEVICES += netgear_wndr3800ch
 
 define Device/netgear_wnr2200_common
-  ATH_SOC := ar7241
+  SOC := ar7241
   DEVICE_MODEL := WNR2200
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
   NETGEAR_KERNEL_MAGIC := 0x32323030
@@ -839,7 +839,7 @@ endef
 TARGET_DEVICES += netgear_wnr2200-16m
 
 define Device/ocedo_koala
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := Ocedo
   DEVICE_MODEL := Koala
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -851,7 +851,7 @@ endef
 TARGET_DEVICES += ocedo_koala
 
 define Device/ocedo_raccoon
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := Ocedo
   DEVICE_MODEL := Raccoon
   IMAGE_SIZE := 7424k
@@ -861,7 +861,7 @@ endef
 TARGET_DEVICES += ocedo_raccoon
 
 define Device/ocedo_ursus
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := Ocedo
   DEVICE_MODEL := Ursus
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
@@ -872,7 +872,7 @@ endef
 TARGET_DEVICES += ocedo_ursus
 
 define Device/openmesh_om5p-ac-v2
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := OpenMesh
   DEVICE_MODEL := OM5P-AC
   DEVICE_VARIANT := v2
@@ -883,7 +883,7 @@ endef
 TARGET_DEVICES += openmesh_om5p-ac-v2
 
 define Device/pcs_cap324
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := PowerCloud Systems
   DEVICE_MODEL := CAP324
   IMAGE_SIZE := 16000k
@@ -892,7 +892,7 @@ endef
 TARGET_DEVICES += pcs_cap324
 
 define Device/pcs_cr3000
-  ATH_SOC := ar9341
+  SOC := ar9341
   DEVICE_VENDOR := PowerCloud Systems
   DEVICE_MODEL := CR3000
   IMAGE_SIZE := 7808k
@@ -901,7 +901,7 @@ endef
 TARGET_DEVICES += pcs_cr3000
 
 define Device/pcs_cr5000
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := PowerCloud Systems
   DEVICE_MODEL := CR5000
   DEVICE_PACKAGES := kmod-usb2
@@ -911,7 +911,7 @@ endef
 TARGET_DEVICES += pcs_cr5000
 
 define Device/phicomm_k2t
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := K2T
   IMAGE_SIZE := 15744k
@@ -923,7 +923,7 @@ TARGET_DEVICES += phicomm_k2t
 
 define Device/pisen_ts-d084
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_VENDOR := PISEN
   DEVICE_MODEL := TS-D084
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2
@@ -932,7 +932,7 @@ endef
 TARGET_DEVICES += pisen_ts-d084
 
 define Device/pisen_wmb001n
-  ATH_SOC := ar9341
+  SOC := ar9341
   DEVICE_VENDOR := PISEN
   DEVICE_MODEL := WMB001N
   IMAGE_SIZE := 14080k
@@ -951,7 +951,7 @@ TARGET_DEVICES += pisen_wmb001n
 
 define Device/pisen_wmm003n
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_VENDOR := PISEN
   DEVICE_MODEL := Cloud Easy Power (WMM003N)
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2
@@ -961,7 +961,7 @@ TARGET_DEVICES += pisen_wmm003n
 
 define Device/qihoo_c301
   $(Device/seama)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := Qihoo
   DEVICE_MODEL := C301
   DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct \
@@ -973,7 +973,7 @@ endef
 TARGET_DEVICES += qihoo_c301
 
 define Device/rosinson_wr818
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := Rosinson
   DEVICE_MODEL := WR818
   IMAGE_SIZE := 15872k
@@ -982,7 +982,7 @@ endef
 TARGET_DEVICES += rosinson_wr818
 
 define Device/sitecom_wlr-7100
-  ATH_SOC := ar1022
+  SOC := ar1022
   DEVICE_VENDOR := Sitecom
   DEVICE_MODEL := WLR-7100
   DEVICE_VARIANT := v1 002
@@ -996,7 +996,7 @@ endef
 TARGET_DEVICES += sitecom_wlr-7100
 
 define Device/trendnet_tew-823dru
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := Trendnet
   DEVICE_MODEL := TEW-823DRU
   DEVICE_VARIANT := v1.0R
@@ -1015,7 +1015,7 @@ TARGET_DEVICES += trendnet_tew-823dru
 
 define Device/wd_mynet-n750
   $(Device/seama)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := Western Digital
   DEVICE_MODEL := My Net N750
   IMAGE_SIZE := 15872k
@@ -1026,7 +1026,7 @@ endef
 TARGET_DEVICES += wd_mynet-n750
 
 define Device/wd_mynet-wifi-rangeextender
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := Western Digital
   DEVICE_MODEL := My Net Wi-Fi Range Extender
   DEVICE_PACKAGES := rssileds nvram -swconfig
@@ -1040,7 +1040,7 @@ endef
 TARGET_DEVICES += wd_mynet-wifi-rangeextender
 
 define Device/winchannel_wb2000
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := Winchannel
   DEVICE_MODEL := WB2000
   IMAGE_SIZE := 15872k
@@ -1050,7 +1050,7 @@ endef
 TARGET_DEVICES += winchannel_wb2000
 
 define Device/xiaomi_mi-router-4q
-  ATH_SOC := qca9561
+  SOC := qca9561
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := Mi Router 4Q
   IMAGE_SIZE := 14336k
@@ -1058,7 +1058,7 @@ endef
 TARGET_DEVICES += xiaomi_mi-router-4q
 
 define Device/yuncore_a770
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := YunCore
   DEVICE_MODEL := A770
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct
@@ -1069,7 +1069,7 @@ endef
 TARGET_DEVICES += yuncore_a770
 
 define Device/yuncore_a782
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := YunCore
   DEVICE_MODEL := A782
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
@@ -1080,7 +1080,7 @@ endef
 TARGET_DEVICES += yuncore_a782
 
 define Device/yuncore_xd4200
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := YunCore
   DEVICE_MODEL := XD4200
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
@@ -1091,7 +1091,7 @@ endef
 TARGET_DEVICES += yuncore_xd4200
 
 define Device/zbtlink_zbt-wd323
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := ZBT
   DEVICE_MODEL := WD323
   IMAGE_SIZE := 16000k
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 50cf6831cc..c6a1441ed9 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -29,7 +29,7 @@ define Build/zyxel-factory
 endef
 
 define Device/aerohive_hiveap-121
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_VENDOR := Aerohive
   DEVICE_MODEL := HiveAP 121
   DEVICE_PACKAGES := kmod-usb2
@@ -47,7 +47,7 @@ endef
 TARGET_DEVICES += aerohive_hiveap-121
 
 define Device/glinet_gl-ar300m-common-nand
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-AR300M
   DEVICE_PACKAGES := kmod-usb2
@@ -77,7 +77,7 @@ endef
 TARGET_DEVICES += glinet_gl-ar300m-nor
 
 define Device/glinet_gl-ar750s-common
-  ATH_SOC := qca9563
+  SOC := qca9563
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-AR750S
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb2 \
@@ -129,7 +129,7 @@ define Device/netgear_ath79_nand
 endef
 
 define Device/netgear_wndr3700-v4
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := WNDR3700
   DEVICE_VARIANT := v4
   NETGEAR_KERNEL_MAGIC := 0x33373033
@@ -141,7 +141,7 @@ endef
 TARGET_DEVICES += netgear_wndr3700-v4
 
 define Device/netgear_wndr4300
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := WNDR4300
   NETGEAR_KERNEL_MAGIC := 0x33373033
   NETGEAR_BOARD_ID := WNDR4300
@@ -152,7 +152,7 @@ endef
 TARGET_DEVICES += netgear_wndr4300
 
 define Device/zyxel_nbg6716
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := NBG6716
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk
index a65468522d..591ea57222 100644
--- a/target/linux/ath79/image/tiny-netgear.mk
+++ b/target/linux/ath79/image/tiny-netgear.mk
@@ -1,7 +1,7 @@
 include ./common-netgear.mk
 
 define Device/netgear_ar7240
-  ATH_SOC := ar7240
+  SOC := ar7240
   NETGEAR_KERNEL_MAGIC := 0x32303631
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
   IMAGE_SIZE := 3712k
@@ -30,7 +30,7 @@ endef
 TARGET_DEVICES += on_n150r
 
 define Device/netgear_wnr1000-v2
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_MODEL := WNR1000
   DEVICE_VARIANT := v2
   NETGEAR_KERNEL_MAGIC := 0x31303031
@@ -45,7 +45,7 @@ endef
 TARGET_DEVICES += netgear_wnr1000-v2
 
 define Device/netgear_wnr2000-v3
-  ATH_SOC := ar7241
+  SOC := ar7241
   DEVICE_MODEL := WNR2000
   DEVICE_VARIANT := v3
   NETGEAR_KERNEL_MAGIC := 0x32303033
diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk
index 3fc933392d..172f22f320 100644
--- a/target/linux/ath79/image/tiny-tp-link.mk
+++ b/target/linux/ath79/image/tiny-tp-link.mk
@@ -2,7 +2,7 @@ include ./common-tp-link.mk
 
 define Device/tplink_tl-mr10u
   $(Device/tplink-4mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_MODEL := TL-MR10U
   DEVICE_PACKAGES := kmod-usb-chipidea2
   TPLINK_HWID := 0x00100101
@@ -13,7 +13,7 @@ TARGET_DEVICES += tplink_tl-mr10u
 define Device/tplink_tl-mr3020-v1
   $(Device/tplink-4mlzma)
   IMAGE_SIZE := 3840k
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_MODEL := TL-MR3020
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
@@ -24,7 +24,7 @@ TARGET_DEVICES += tplink_tl-mr3020-v1
 
 define Device/tplink_tl-mr3040-v2
   $(Device/tplink-4mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_MODEL := TL-MR3040
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
@@ -35,7 +35,7 @@ TARGET_DEVICES += tplink_tl-mr3040-v2
 
 define Device/tplink_tl-mr3220-v1
   $(Device/tplink-4m)
-  ATH_SOC := ar7241
+  SOC := ar7241
   DEVICE_MODEL := TL-MR3220
   DEVICE_VARIANT := v1
   TPLINK_HWID := 0x32200001
@@ -46,7 +46,7 @@ TARGET_DEVICES += tplink_tl-mr3220-v1
 
 define Device/tplink_tl-mr3420-v1
   $(Device/tplink-4m)
-  ATH_SOC := ar7241
+  SOC := ar7241
   DEVICE_MODEL := TL-MR3420
   DEVICE_VARIANT := v1
   TPLINK_HWID := 0x34200001
@@ -57,7 +57,7 @@ TARGET_DEVICES += tplink_tl-mr3420-v1
 
 define Device/tplink_tl-mr3420-v2
   $(Device/tplink-4mlzma)
-  ATH_SOC := ar9341
+  SOC := ar9341
   DEVICE_MODEL := TL-MR3420
   DEVICE_VARIANT := v2
   TPLINK_HWID := 0x34200002
@@ -68,7 +68,7 @@ TARGET_DEVICES += tplink_tl-mr3420-v2
 
 define Device/tplink_tl-wa901nd-v2
   $(Device/tplink-4m)
-  ATH_SOC := ar9132
+  SOC := ar9132
   DEVICE_MODEL := TL-WA901ND
   DEVICE_VARIANT := v2
   TPLINK_HWID := 0x09010002
@@ -77,7 +77,7 @@ TARGET_DEVICES += tplink_tl-wa901nd-v2
 
 define Device/tplink_tl-wr703n
   $(Device/tplink-4mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_MODEL := TL-WR703N
   DEVICE_PACKAGES := kmod-usb-chipidea2
   TPLINK_HWID := 0x07030101
@@ -87,7 +87,7 @@ TARGET_DEVICES += tplink_tl-wr703n
 
 define Device/tplink_tl-wr740n-v1
   $(Device/tplink-4m)
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_MODEL := TL-WR740N
   DEVICE_VARIANT := v1/v2
   TPLINK_HWID := 0x07400001
@@ -96,7 +96,7 @@ TARGET_DEVICES += tplink_tl-wr740n-v1
 
 define Device/tplink_tl-wr740n-v3
   $(Device/tplink-4m)
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_MODEL := TL-WR740N
   DEVICE_VARIANT := v3
   TPLINK_HWID := 0x07400003
@@ -105,7 +105,7 @@ TARGET_DEVICES += tplink_tl-wr740n-v3
 
 define Device/tplink_tl-wr740n-v4
   $(Device/tplink-4mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_MODEL := TL-WR740N
   DEVICE_VARIANT := v4
   TPLINK_HWID := 0x07400004
@@ -115,7 +115,7 @@ TARGET_DEVICES += tplink_tl-wr740n-v4
 
 define Device/tplink_tl-wr741-v1
   $(Device/tplink-4m)
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_MODEL := TL-WR741N/ND
   DEVICE_VARIANT := v1/v2
   TPLINK_HWID := 0x07410001
@@ -124,7 +124,7 @@ TARGET_DEVICES += tplink_tl-wr741-v1
 
 define Device/tplink_tl-wr741nd-v4
   $(Device/tplink-4mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_MODEL := TL-WR741N/ND
   DEVICE_VARIANT := v4
   TPLINK_HWID := 0x07410004
@@ -134,7 +134,7 @@ TARGET_DEVICES += tplink_tl-wr741nd-v4
 
 define Device/tplink_tl-wr743nd-v1
   $(Device/tplink-4m)
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_MODEL := TL-WR743ND
   DEVICE_VARIANT := v1
   TPLINK_HWID := 0x07430001
@@ -143,7 +143,7 @@ TARGET_DEVICES += tplink_tl-wr743nd-v1
 
 define Device/tplink_tl-wr841-v5
   $(Device/tplink-4m)
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_MODEL := TL-WR841N/ND
   DEVICE_VARIANT := v5/v6
   TPLINK_HWID := 0x08410005
@@ -152,7 +152,7 @@ TARGET_DEVICES += tplink_tl-wr841-v5
 
 define Device/tplink_tl-wr841-v7
   $(Device/tplink-4m)
-  ATH_SOC := ar7241
+  SOC := ar7241
   DEVICE_MODEL := TL-WR841N/ND
   DEVICE_VARIANT := v7
   TPLINK_HWID := 0x08410007
@@ -162,7 +162,7 @@ TARGET_DEVICES += tplink_tl-wr841-v7
 
 define Device/tplink_tl-wr841-v8
   $(Device/tplink-4mlzma)
-  ATH_SOC := ar9341
+  SOC := ar9341
   DEVICE_MODEL := TL-WR841N/ND
   DEVICE_VARIANT := v8
   TPLINK_HWID := 0x08410008
@@ -172,7 +172,7 @@ TARGET_DEVICES += tplink_tl-wr841-v8
 
 define Device/tplink_tl-wr841-v9
   $(Device/tplink-4mlzma)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := TL-WR841N/ND
   DEVICE_VARIANT := v9
   TPLINK_HWID := 0x08410009
@@ -182,7 +182,7 @@ TARGET_DEVICES += tplink_tl-wr841-v9
 
 define Device/tplink_tl-wr841-v10
   $(Device/tplink-4mlzma)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := TL-WR841N/ND
   DEVICE_VARIANT := v10
   TPLINK_HWID := 0x08410010
@@ -192,7 +192,7 @@ TARGET_DEVICES += tplink_tl-wr841-v10
 
 define Device/tplink_tl-wr841-v11
   $(Device/tplink-4mlzma)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := TL-WR841N/ND
   DEVICE_VARIANT := v11
   TPLINK_HWID := 0x08410011
@@ -205,7 +205,7 @@ TARGET_DEVICES += tplink_tl-wr841-v11
 
 define Device/tplink_tl-wr841-v12
   $(Device/tplink-4mlzma)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := TL-WR841N/ND
   DEVICE_VARIANT := v12
   TPLINK_HWID := 0x08410012
@@ -218,7 +218,7 @@ TARGET_DEVICES += tplink_tl-wr841-v12
 
 define Device/tplink_tl-wr940n-v3
   $(Device/tplink-4mlzma)
-  ATH_SOC := tp9343
+  SOC := tp9343
   DEVICE_MODEL := TL-WR940N
   DEVICE_VARIANT := v3
   TPLINK_HWID := 0x09410006
@@ -228,7 +228,7 @@ TARGET_DEVICES += tplink_tl-wr940n-v3
 
 define Device/tplink_tl-wr940n-v4
   $(Device/tplink-4mlzma)
-  ATH_SOC := tp9343
+  SOC := tp9343
   DEVICE_MODEL := TL-WR940N
   DEVICE_VARIANT := v4
   TPLINK_HWID := 0x09400004
@@ -242,7 +242,7 @@ TARGET_DEVICES += tplink_tl-wr940n-v4
 
 define Device/tplink_tl-wr941-v2
   $(Device/tplink-4m)
-  ATH_SOC := ar9132
+  SOC := ar9132
   DEVICE_MODEL := TL-WR941ND
   DEVICE_VARIANT := v2/v3
   DEVICE_ALT0_VENDOR := TP-Link
@@ -255,7 +255,7 @@ TARGET_DEVICES += tplink_tl-wr941-v2
 
 define Device/tplink_tl-wr941-v4
   $(Device/tplink-4m)
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_MODEL := TL-WR941ND
   DEVICE_VARIANT := v4
   DEVICE_ALT0_VENDOR := TP-Link
@@ -267,7 +267,7 @@ TARGET_DEVICES += tplink_tl-wr941-v4
 
 define Device/tplink_tl-wr941nd-v6
   $(Device/tplink-4mlzma)
-  ATH_SOC := tp9343
+  SOC := tp9343
   DEVICE_MODEL := TL-WR941ND
   DEVICE_VARIANT := v6
   TPLINK_HWID := 0x09410006
@@ -277,7 +277,7 @@ TARGET_DEVICES += tplink_tl-wr941nd-v6
 
 define Device/tplink_tl-wr941n-v7-cn
   $(Device/tplink-4mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WR941N
   DEVICE_VARIANT := v7 (CN)
   TPLINK_HWID := 0x09410007
diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk
index 039925e019..b974777c61 100644
--- a/target/linux/ath79/image/tiny.mk
+++ b/target/linux/ath79/image/tiny.mk
@@ -1,7 +1,7 @@
 include ./common-buffalo.mk
 
 define Device/buffalo_whr-g301n
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-G301N
   IMAGE_SIZE := 3712k
@@ -16,7 +16,7 @@ endef
 TARGET_DEVICES += buffalo_whr-g301n
 
 define Device/dlink_dir-615-e4
-  ATH_SOC := ar7240
+  SOC := ar7240
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-615
   DEVICE_VARIANT := E4
@@ -34,7 +34,7 @@ endef
 TARGET_DEVICES += dlink_dir-615-e4
 
 define Device/pqi_air-pen
-  ATH_SOC := ar9330
+  SOC := ar9330
   DEVICE_VENDOR := PQI
   DEVICE_MODEL := Air-Pen
   DEVICE_PACKAGES := kmod-usb2
-- 
2.25.1