aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-24 18:38:53 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-24 18:38:53 +0100
commit09ee51c614d95904010f3646938b5b85c73bebec (patch)
tree5153742aab109ab81bb49fbb2386d903b019c6c4
parentd9a0794f8d56236b2984c15948d93aa5d320e16e (diff)
downloadupstream-09ee51c614d95904010f3646938b5b85c73bebec.tar.gz
upstream-09ee51c614d95904010f3646938b5b85c73bebec.tar.bz2
upstream-09ee51c614d95904010f3646938b5b85c73bebec.zip
lantiq: define SOC only once for uniform targets
In lantiq there are several subtarget where all devices have the same value set to the SOC variable for each device individually. This patch introduces a non-device-dependent variable DEFAULT_SOC, which is used if no specific SOC is set for a device, and thus reduces the number of redundant definitions drastically. This is applied to all subtargets except xway, as only the latter has two different SOCs. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/lantiq/image/Makefile4
-rw-r--r--target/linux/lantiq/image/amazonse.mk2
-rw-r--r--target/linux/lantiq/image/falcon.mk12
-rw-r--r--target/linux/lantiq/image/tp-link.mk1
-rw-r--r--target/linux/lantiq/image/vr9.mk18
-rw-r--r--target/linux/lantiq/image/xway_legacy.mk5
6 files changed, 4 insertions, 38 deletions
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 68de191283..d385cdca7b 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -111,10 +111,12 @@ define Device/AVM
endef
ifeq ($(SUBTARGET),ase)
+DEFAULT_SOC := amazonse
include amazonse.mk
endif
ifeq ($(SUBTARGET),xway_legacy)
+DEFAULT_SOC := danube
include xway_legacy.mk
endif
@@ -125,12 +127,14 @@ endif
ifeq ($(SUBTARGET),xrx200)
+DEFAULT_SOC := vr9
include tp-link.mk
include vr9.mk
endif
ifeq ($(SUBTARGET),falcon)
+DEFAULT_SOC := falcon
include falcon.mk
endif
diff --git a/target/linux/lantiq/image/amazonse.mk b/target/linux/lantiq/image/amazonse.mk
index c9329a4dd9..4a23a68e40 100644
--- a/target/linux/lantiq/image/amazonse.mk
+++ b/target/linux/lantiq/image/amazonse.mk
@@ -2,7 +2,6 @@ define Device/allnet_all0333cj
DEVICE_VENDOR := Allnet
DEVICE_MODEL := ALL0333CJ
IMAGE_SIZE := 3700k
- SOC := amazonse
DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \
kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \
ltq-adsl-app ppp-mod-pppoe
@@ -13,7 +12,6 @@ define Device/netgear_dgn1000b
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := DGN1000B
IMAGE_SIZE := 6000k
- SOC := amazonse
DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \
kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \
ltq-adsl-app ppp-mod-pppoe
diff --git a/target/linux/lantiq/image/falcon.mk b/target/linux/lantiq/image/falcon.mk
index e6aae1240b..a5490f6e68 100644
--- a/target/linux/lantiq/image/falcon.mk
+++ b/target/linux/lantiq/image/falcon.mk
@@ -2,7 +2,6 @@ define Device/lantiq_easy88388
DEVICE_VENDOR := Lantiq
DEVICE_MODEL := EASY88388 Falcon FTTDP8 Reference Board
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_easy88388
@@ -10,7 +9,6 @@ define Device/lantiq_easy88444
DEVICE_VENDOR := Lantiq
DEVICE_MODEL := EASY88444 Falcon FTTdp G.FAST Reference Board
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_easy88444
@@ -19,7 +17,6 @@ define Device/lantiq_easy98020
DEVICE_MODEL := Falcon SFU Reference Board (EASY98020)
DEVICE_VARIANT := v1.0-v1.7
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_easy98020
@@ -28,7 +25,6 @@ define Device/lantiq_easy98020-v18
DEVICE_MODEL := Falcon SFU Reference Board (EASY98020)
DEVICE_VARIANT := v1.8
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_easy98020-v18
@@ -36,7 +32,6 @@ define Device/lantiq_easy98021
DEVICE_VENDOR := Lantiq
DEVICE_MODEL := Falcon HGU Reference Board (EASY98021)
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_easy98021
@@ -45,7 +40,6 @@ define Device/lantiq_easy98035synce
DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE)
DEVICE_VARIANT := with Synchronous Ethernet
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_easy98035synce
@@ -54,7 +48,6 @@ define Device/lantiq_easy98035synce1588
DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE1588)
DEVICE_VARIANT := with SyncE and IEEE1588
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_easy98035synce1588
@@ -63,7 +56,6 @@ define Device/lantiq_easy98000-nand
DEVICE_MODEL := EASY98000 Falcon Eval Board
DEVICE_VARIANT := NAND
IMAGE_SIZE := 3904k
- SOC := falcon
DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
endef
TARGET_DEVICES += lantiq_easy98000-nand
@@ -73,7 +65,6 @@ define Device/lantiq_easy98000-nor
DEVICE_MODEL := EASY98000 Falcon Eval Board
DEVICE_VARIANT := NOR
IMAGE_SIZE := 3904k
- SOC := falcon
DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
endef
TARGET_DEVICES += lantiq_easy98000-nor
@@ -83,7 +74,6 @@ define Device/lantiq_easy98000-sflash
DEVICE_MODEL := EASY98000 Falcon Eval Board
DEVICE_VARIANT := SFLASH
IMAGE_SIZE := 7424k
- SOC := falcon
DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
endef
TARGET_DEVICES += lantiq_easy98000-sflash
@@ -92,7 +82,6 @@ define Device/lantiq_falcon-mdu
DEVICE_VENDOR := Lantiq
DEVICE_MODEL := Falcon / VINAXdp MDU Board
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_falcon-mdu
@@ -100,6 +89,5 @@ define Device/lantiq_falcon-sfp
DEVICE_VENDOR := Lantiq
DEVICE_MODEL := Falcon SFP Stick
IMAGE_SIZE := 7424k
- SOC := falcon
endef
TARGET_DEVICES += lantiq_falcon-sfp
diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index fa98f31f59..acbc32b46a 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -2,7 +2,6 @@ DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLIN
define Device/lantiqTpLink
DEVICE_VENDOR := TP-Link
- SOC := vr9
TPLINK_HWREVADD := 0
TPLINK_HVERSION := 2
KERNEL := kernel-bin | append-dtb | lzma
diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk
index cd43c61e6e..083d8efe0f 100644
--- a/target/linux/lantiq/image/vr9.mk
+++ b/target/linux/lantiq/image/vr9.mk
@@ -3,7 +3,6 @@ define Device/alphanetworks_asl56026
DEVICE_MODEL := ASL56026
DEVICE_ALT0_VENDOR := BT Openreach
DEVICE_ALT0_MODEL := ECI VDSL Modem V-2FUb/I
- SOC := vr9
IMAGE_SIZE := 7488k
endef
TARGET_DEVICES += alphanetworks_asl56026
@@ -17,7 +16,6 @@ define Device/arcadyan_arv7519rw22
DEVICE_ALT1_VENDOR := Astoria Networks
DEVICE_ALT1_MODEL := ARV7519RW22
IMAGE_SIZE := 31232k
- SOC := vr9
DEVICE_PACKAGES := kmod-usb-dwc2
SUPPORTED_DEVICES += ARV7519RW22
endef
@@ -27,7 +25,6 @@ define Device/arcadyan_vg3503j
DEVICE_VENDOR := BT Openreach
DEVICE_MODEL := ECI VDSL Modem V-2FUb/R
IMAGE_SIZE := 8000k
- SOC := vr9
SUPPORTED_DEVICES += VG3503J
endef
TARGET_DEVICES += arcadyan_vg3503j
@@ -41,7 +38,6 @@ define Device/arcadyan_vgv7510kw22-brn
DEVICE_ALT0_MODEL := Box 6431
DEVICE_ALT0_VARIANT := BRN
IMAGE_SIZE := 7168k
- SOC := vr9
SIGNATURE := BRNDA6431
MAGIC := 0x12345678
CRC32_POLY := 0x04c11db7
@@ -58,7 +54,6 @@ define Device/arcadyan_vgv7510kw22-nor
DEVICE_ALT0_MODEL := Box 6431
DEVICE_ALT0_VARIANT := NOR
IMAGE_SIZE := 15232k
- SOC := vr9
DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
SUPPORTED_DEVICES += VGV7510KW22NOR
endef
@@ -73,7 +68,6 @@ define Device/arcadyan_vgv7519-brn
DEVICE_ALT0_MODEL := Experiabox 8
DEVICE_ALT0_VARIANT := BRN
IMAGE_SIZE := 7168k
- SOC := vr9
SIGNATURE := 5D00008000
MAGIC := 0x12345678
CRC32_POLY := 0x2083b8ed
@@ -90,7 +84,6 @@ define Device/arcadyan_vgv7519-nor
DEVICE_ALT0_MODEL := Experiabox 8
DEVICE_ALT0_VARIANT := NOR
IMAGE_SIZE := 15360k
- SOC := vr9
DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
SUPPORTED_DEVICES += VGV7519NOR
endef
@@ -101,7 +94,6 @@ define Device/avm_fritz3370
$(Device/NAND)
DEVICE_MODEL := FRITZ!Box 3370
DEVICE_VARIANT := Rev. 2
- SOC := vr9
KERNEL_SIZE := 4096k
UBINIZE_OPTS := -E 5
IMAGES += eva-kernel.bin eva-filesystem.bin
@@ -128,7 +120,6 @@ define Device/avm_fritz7360sl
$(Device/AVM)
DEVICE_MODEL := FRITZ!Box 7360 SL
IMAGE_SIZE := 15744k
- SOC := vr9
DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2
SUPPORTED_DEVICES += FRITZ7360SL
endef
@@ -140,7 +131,6 @@ define Device/avm_fritz7362sl
DEVICE_MODEL := FRITZ!Box 7362 SL
KERNEL_SIZE := 4096k
IMAGE_SIZE := 49152k
- SOC := vr9
DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs
endef
TARGET_DEVICES += avm_fritz7362sl
@@ -150,7 +140,6 @@ define Device/avm_fritz7412
$(Device/NAND)
DEVICE_MODEL := FRITZ!Box 7412
BOARD_NAME := FRITZ7412
- SOC := vr9
KERNEL_SIZE := 4096k
IMAGE_SIZE := 49152k
DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata
@@ -163,7 +152,6 @@ define Device/bt_homehub-v5a
DEVICE_MODEL := Home Hub 5
DEVICE_VARIANT := Type A
BOARD_NAME := BTHOMEHUBV5A
- SOC := vr9
DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \
kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2
SUPPORTED_DEVICES += BTHOMEHUBV5A
@@ -174,7 +162,6 @@ define Device/buffalo_wbmr-300hpd
DEVICE_VENDOR := Buffalo
DEVICE_MODEL := WBMR-300HPD
IMAGE_SIZE := 15616k
- SOC := vr9
DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2
SUPPORTED_DEVICES += WBMR300
endef
@@ -185,7 +172,6 @@ define Device/lantiq_easy80920-nand
DEVICE_VENDOR := Lantiq
DEVICE_MODEL := VR9 EASY80920
DEVICE_VARIANT := NAND
- SOC := vr9
IMAGE_SIZE := 64512k
DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
endef
@@ -195,7 +181,6 @@ define Device/lantiq_easy80920-nor
DEVICE_VENDOR := Lantiq
DEVICE_MODEL := VR9 EASY80920
DEVICE_VARIANT := NOR
- SOC := vr9
IMAGE_SIZE := 7936k
DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
endef
@@ -204,7 +189,6 @@ TARGET_DEVICES += lantiq_easy80920-nor
define Device/netgear_dm200
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := DM200
- SOC := vr9
IMAGES := sysupgrade.bin factory.img
IMAGE/sysupgrade.bin := append-kernel | \
pad-offset 64k 64 | append-uImage-fakehdr filesystem | \
@@ -224,7 +208,6 @@ define Device/zyxel_p-2812hnu-f1
DEVICE_MODEL := P-2812HNU
DEVICE_VARIANT := F1
BOARD_NAME := P2812HNUF1
- SOC := vr9
DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
KERNEL_SIZE := 3072k
SUPPORTED_DEVICES += P2812HNUF1
@@ -237,7 +220,6 @@ define Device/zyxel_p-2812hnu-f3
DEVICE_MODEL := P-2812HNU
DEVICE_VARIANT := F3
BOARD_NAME := P2812HNUF3
- SOC := vr9
DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2
SUPPORTED_DEVICES += P2812HNUF3
endef
diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk
index 8af2e1c3fc..52a29ab2f0 100644
--- a/target/linux/lantiq/image/xway_legacy.mk
+++ b/target/linux/lantiq/image/xway_legacy.mk
@@ -2,7 +2,6 @@ define Device/arcadyan_arv4518pwr01
DEVICE_VENDOR := Arcadyan
DEVICE_MODEL := ARV4518PWR01
IMAGE_SIZE := 3776k
- SOC := danube
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -16,7 +15,6 @@ define Device/arcadyan_arv4518pwr01a
DEVICE_VENDOR := Arcadyan
DEVICE_MODEL := ARV4518PWR01A
IMAGE_SIZE := 3776k
- SOC := danube
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -34,7 +32,6 @@ define Device/arcadyan_arv4520pw
DEVICE_ALT1_VENDOR := Airties
DEVICE_ALT1_MODEL := WAV-281
IMAGE_SIZE := 3648k
- SOC := danube
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -51,7 +48,6 @@ define Device/arcadyan_arv4525pw
DEVICE_ALT0_MODEL := Speedport W502V
DEVICE_ALT0_VARIANT := Typ A
IMAGE_SIZE := 3776k
- SOC := danube
DEVICE_PACKAGES := kmod-ath5k wpad-mini \
kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -66,7 +62,6 @@ define Device/arcadyan_arv452cqw
DEVICE_ALT0_VENDOR := Vodafone
DEVICE_ALT0_MODEL := Easybox 801
IMAGE_SIZE := 3776k
- SOC := danube
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
kmod-ath5k wpad-mini \
kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \