From 73aa78c4a0c319a0a66096d08358fa41008db0de Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 14 Aug 2023 13:47:49 +0200 Subject: [PATCH] ipq40xx: commonize Meraki recipe MR33 and MR74 share pretty much everything in the image recipe, so lets extract a common recipe to avoid duplication. Signed-off-by: Robert Marko (cherry picked from commit 9e9dc1890c6f58d858208136ecfa435445dfca09) --- target/linux/ipq40xx/image/generic.mk | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index a9dd2aa0912..55e143e0dd8 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -756,26 +756,25 @@ define Device/luma_wrtq-329acn endef TARGET_DEVICES += luma_wrtq-329acn -define Device/meraki_mr33 +define Device/meraki_common $(call Device/FitImage) DEVICE_VENDOR := Cisco Meraki - DEVICE_MODEL := MR33 SOC := qcom-ipq4029 BLOCKSIZE := 128k PAGESIZE := 2048 DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct +endef + +define Device/meraki_mr33 + $(call Device/meraki_common) + DEVICE_MODEL := MR33 DEFAULT := n endef TARGET_DEVICES += meraki_mr33 define Device/meraki_mr74 - $(call Device/FitImage) - DEVICE_VENDOR := Cisco Meraki + $(call Device/meraki_common) DEVICE_MODEL := MR74 - SOC := qcom-ipq4029 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct DEVICE_DTS_CONFIG := config@3 DEFAULT := n endef