From f52081bcf938efcd910832f3c3713ab9f3ca0738 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 19 Jan 2021 20:05:35 +0100 Subject: treewide: provide global default for SUPPORTED_DEVICES The majority of our targets provide a default value for the variable SUPPORTED_DEVICES, which is used in images to check against the compatible on a running device: SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) At the moment, this is implemented in the Device/Default block of the individual targets or even subtargets. However, since we standardized device names and compatible in the recent past, almost all targets are following the same scheme now: device/image name: vendor_model compatible: vendor,model The equal redundant definitions are a symptom of this process. Consequently, this patch moves the definition to image.mk making it a global default. For the few targets not using the scheme above, SUPPORTED_DEVICES will be defined to a different value in Device/Default anyway, overwriting the default. In other words: This change is supposed to be cosmetic. This can be used as a global measure to get the current compatible with: $(firstword $(SUPPORTED_DEVICES)) (Though this is not precisely an achievement of this commit.) Signed-off-by: Adrian Schmutzler --- target/linux/oxnas/image/ox810se.mk | 1 - target/linux/oxnas/image/ox820.mk | 1 - 2 files changed, 2 deletions(-) (limited to 'target/linux/oxnas') diff --git a/target/linux/oxnas/image/ox810se.mk b/target/linux/oxnas/image/ox810se.mk index b9bb5e7117..77bdcc7716 100644 --- a/target/linux/oxnas/image/ox810se.mk +++ b/target/linux/oxnas/image/ox810se.mk @@ -6,7 +6,6 @@ define Device/Default KERNEL_INSTALL := 1 FILESYSTEMS := squashfs ext4 PROFILES := Default - SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) DEVICE_DTS := ox810se-$(subst _,-,$(1)) IMAGES := sysupgrade.tar IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata diff --git a/target/linux/oxnas/image/ox820.mk b/target/linux/oxnas/image/ox820.mk index a52e09786b..8dea842503 100644 --- a/target/linux/oxnas/image/ox820.mk +++ b/target/linux/oxnas/image/ox820.mk @@ -10,7 +10,6 @@ define Device/Default SUBPAGESIZE := 512 FILESYSTEMS := squashfs ubifs PROFILES := Default - SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) DEVICE_DTS := ox820-$(subst _,-,$(1)) KERNEL := kernel-bin | append-dtb | uImage none IMAGES := ubinized.bin sysupgrade.tar -- cgit v1.2.3