domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: provide global default for SUPPORTED_DEVICES

Browse Source 
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 <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler
2021-01-19 20:05:35 +01:00
parent b2bab95116
commit f52081bcf9
23 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/image.mk
View File

@@ -404,7 +404,7 @@ define Device/Init
UIMAGE_NAME := UIMAGE_NAME :=
DEVICE_COMPAT_VERSION := 1.0 DEVICE_COMPAT_VERSION := 1.0
DEVICE_COMPAT_MESSAGE := DEVICE_COMPAT_MESSAGE :=
SUPPORTED_DEVICES := SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
IMAGE_METADATA := IMAGE_METADATA :=
FILESYSTEMS := $(TARGET_FILESYSTEMS) FILESYSTEMS := $(TARGET_FILESYSTEMS)

1
target/linux/apm821xx/image/Makefile
View File

@@ -88,7 +88,6 @@ define Device/Default
KERNEL_LOADADDR := 0x00000000 KERNEL_LOADADDR := 0x00000000
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
DEVICE_DTS = $(subst _,-,$(1)) DEVICE_DTS = $(subst _,-,$(1))
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
endef endef
include $(SUBTARGET).mk include $(SUBTARGET).mk

1
target/linux/at91/image/Makefile
View File

@@ -25,7 +25,6 @@ define Device/Default
PROFILES := Default PROFILES := Default
FILESYSTEMS := squashfs ubifs ext4 FILESYSTEMS := squashfs ubifs ext4
DEVICE_DTS = $(lastword $(subst _, ,$(1))) DEVICE_DTS = $(lastword $(subst _, ,$(1)))
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL_SIZE := 4096k KERNEL_SIZE := 4096k
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma KERNEL := kernel-bin | append-dtb | lzma | uImage lzma

1
target/linux/ath79/image/Makefile
View File

@@ -65,7 +65,6 @@ define Device/Default
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
COMPILE := COMPILE :=
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | \ IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | \
append-rootfs | pad-rootfs | append-metadata | check-size append-rootfs | pad-rootfs | append-metadata | check-size

1
target/linux/bcm63xx/image/bcm63xx_nand.mk
View File

@@ -34,7 +34,6 @@ define Device/bcm63xx-nand
CFE_WFI_FLAGS := CFE_WFI_FLAGS :=
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
DEVICE_PACKAGES += nand-utils DEVICE_PACKAGES += nand-utils
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
endef endef
define Device/sercomm-nand define Device/sercomm-nand

1
target/linux/gemini/image/Makefile
View File

@@ -130,7 +130,6 @@ define Device/Default
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL := kernel-bin | append-dtb KERNEL := kernel-bin | append-dtb
BLOCKSIZE := 128k BLOCKSIZE := 128k
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
endef endef
# A reasonable set of default packages handling the NAS type # A reasonable set of default packages handling the NAS type

1
target/linux/ipq40xx/image/Makefile
View File

@@ -8,7 +8,6 @@ define Device/Default
KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_PREFIX := $$(IMAGE_PREFIX)
KERNEL_LOADADDR := 0x80208000 KERNEL_LOADADDR := 0x80208000
DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
IMAGE/sysupgrade.bin/squashfs := IMAGE/sysupgrade.bin/squashfs :=

1
target/linux/ipq806x/image/Makefile
View File

@@ -30,7 +30,6 @@ define Device/Default
KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_PREFIX := $$(IMAGE_PREFIX)
KERNEL_LOADADDR = 0x42208000 KERNEL_LOADADDR = 0x42208000
DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
IMAGE/sysupgrade.bin/squashfs := IMAGE/sysupgrade.bin/squashfs :=

1
target/linux/kirkwood/image/Makefile
View File

@@ -30,7 +30,6 @@ define Device/Default
IMAGES := sysupgrade.bin factory.bin IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/factory.bin := append-ubi IMAGE/factory.bin := append-ubi
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
endef endef
define Device/checkpoint_l-50 define Device/checkpoint_l-50

1
target/linux/lantiq/image/Makefile
View File

@@ -65,7 +65,6 @@ define Device/Default
FILESYSTEMS := squashfs FILESYSTEMS := squashfs
SOC := $(DEFAULT_SOC) SOC := $(DEFAULT_SOC)
DEVICE_DTS = $$(SOC)_$(1) DEVICE_DTS = $$(SOC)_$(1)
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size
endef endef

1
target/linux/layerscape/image/armv7.mk
View File

@@ -15,7 +15,6 @@ define Device/Default
KERNEL_LOADADDR := 0x80008000 KERNEL_LOADADDR := 0x80008000
KERNEL_ENTRY_POINT := 0x80008000 KERNEL_ENTRY_POINT := 0x80008000
DEVICE_DTS = $(lastword $(subst _, ,$(1))) DEVICE_DTS = $(lastword $(subst _, ,$(1)))
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
IMAGE_SIZE := 64m IMAGE_SIZE := 64m
IMAGE/sysupgrade.bin = \ IMAGE/sysupgrade.bin = \
ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \

1
target/linux/layerscape/image/armv8_64b.mk
View File

@@ -14,7 +14,6 @@ define Device/Default
KERNEL_LOADADDR := 0x80080000 KERNEL_LOADADDR := 0x80080000
KERNEL_ENTRY_POINT := 0x80080000 KERNEL_ENTRY_POINT := 0x80080000
DEVICE_DTS = freescale/$(subst _,-,$(1)) DEVICE_DTS = freescale/$(subst _,-,$(1))
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
IMAGE_SIZE := 64m IMAGE_SIZE := 64m
IMAGE/sysupgrade.bin = \ IMAGE/sysupgrade.bin = \
ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \

1
target/linux/mediatek/image/Makefile
View File

@@ -31,7 +31,6 @@ define Device/Default
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | \
pad-rootfs | append-metadata pad-rootfs | append-metadata
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
endef endef
include $(SUBTARGET).mk include $(SUBTARGET).mk

1
target/linux/mpc85xx/image/Makefile
View File

@@ -16,7 +16,6 @@ define Device/Default
KERNEL_ENTRY := 0x00000000 KERNEL_ENTRY := 0x00000000
KERNEL_LOADADDR := 0x00000000 KERNEL_LOADADDR := 0x00000000
KERNEL := kernel-bin KERNEL := kernel-bin
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
endef endef
include $(SUBTARGET).mk include $(SUBTARGET).mk

1
target/linux/mvebu/image/Makefile
View File

@@ -105,7 +105,6 @@ define Device/Default
KERNEL := kernel-bin | append-dtb | uImage none KERNEL := kernel-bin | append-dtb | uImage none
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
UBOOT := UBOOT :=
BOOT_SCRIPT := BOOT_SCRIPT :=

1
target/linux/omap/image/Makefile
View File

@@ -38,7 +38,6 @@ define Device/Default
DEVICE_DTS = $(lastword $(subst _, ,$(1))) DEVICE_DTS = $(lastword $(subst _, ,$(1)))
IMAGES := sdcard.img.gz IMAGES := sdcard.img.gz
IMAGE/sdcard.img.gz := omap-sdcard | append-metadata | gzip IMAGE/sdcard.img.gz := omap-sdcard | append-metadata | gzip
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
endef endef
#uboot-omap-am335x_evm uboot-omap-omap3_beagle uboot-omap-omap3_overo uboot-omap-omap4_panda #uboot-omap-am335x_evm uboot-omap-omap3_beagle uboot-omap-omap3_overo uboot-omap-omap4_panda

1
target/linux/oxnas/image/ox810se.mk
View File

@@ -6,7 +6,6 @@ define Device/Default
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
FILESYSTEMS := squashfs ext4 FILESYSTEMS := squashfs ext4
PROFILES := Default PROFILES := Default
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
DEVICE_DTS := ox810se-$(subst _,-,$(1)) DEVICE_DTS := ox810se-$(subst _,-,$(1))
IMAGES := sysupgrade.tar IMAGES := sysupgrade.tar
IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata

1
target/linux/oxnas/image/ox820.mk
View File

@@ -10,7 +10,6 @@ define Device/Default
SUBPAGESIZE := 512 SUBPAGESIZE := 512
FILESYSTEMS := squashfs ubifs FILESYSTEMS := squashfs ubifs
PROFILES := Default PROFILES := Default
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
DEVICE_DTS := ox820-$(subst _,-,$(1)) DEVICE_DTS := ox820-$(subst _,-,$(1))
KERNEL := kernel-bin | append-dtb | uImage none KERNEL := kernel-bin | append-dtb | uImage none
IMAGES := ubinized.bin sysupgrade.tar IMAGES := ubinized.bin sysupgrade.tar

1
target/linux/ramips/image/Makefile
View File

@@ -187,7 +187,6 @@ define Device/Default
DEVICE_DTS = $$(SOC)_$(1) DEVICE_DTS = $$(SOC)_$(1)
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
COMPILE := COMPILE :=
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size
endef endef

1
target/linux/realtek/image/Makefile
View File

@@ -13,7 +13,6 @@ define Device/Default
KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | uImage gzip KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | uImage gzip
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
DEVICE_DTS = $$(SOC)_$(1) DEVICE_DTS = $$(SOC)_$(1)
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | \
append-metadata | check-size append-metadata | check-size

1
target/linux/rockchip/image/Makefile
View File

@@ -52,7 +52,6 @@ define Device/Default
PROFILES := Default PROFILES := Default
KERNEL := kernel-bin KERNEL := kernel-bin
IMAGES := sysupgrade.img.gz IMAGES := sysupgrade.img.gz
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1))) DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1)))
endef endef

1
target/linux/sunxi/image/Makefile
View File

@@ -37,7 +37,6 @@ define Device/Default
KERNEL := kernel-bin | uImage none KERNEL := kernel-bin | uImage none
IMAGES := sdcard.img.gz IMAGES := sdcard.img.gz
IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
SUNXI_DTS_DIR := SUNXI_DTS_DIR :=
SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1))) SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1)))
endef endef

1
target/linux/tegra/image/Makefile
View File

@@ -38,7 +38,6 @@ define Device/Default
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL := kernel-bin KERNEL := kernel-bin
PROFILES := Default PROFILES := Default
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
endef endef
define Device/compulab_trimslice define Device/compulab_trimslice