From: Felix Fietkau Date: Thu, 14 Jul 2016 11:58:23 +0000 (+0200) Subject: image.mk: clean up redundant code related to DEVICE_DTS X-Git-Tag: v17.01.0-rc1~2057 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=8e2764ce9bb6716acb955a0c27d8db291d68650c image.mk: clean up redundant code related to DEVICE_DTS It is used by a core build template, so the variable should be initialized and added to DEVICE_VARS in the core. Same for DEVICE_DTS_DIR Signed-off-by: Felix Fietkau --- diff --git a/include/image.mk b/include/image.mk index bf5f0a6a20..b257eae121 100644 --- a/include/image.mk +++ b/include/image.mk @@ -329,11 +329,15 @@ define Device/Init SUBPAGESIZE := UBINIZE_OPTS := -E 5 + DEVICE_DTS := + DEVICE_DTS_DIR := + FILESYSTEMS := $(TARGET_FILESYSTEMS) endef DEFAULT_DEVICE_VARS := \ DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \ + DEVICE_DTS DEVICE_DTS_DIR \ UBOOTENV_IN_UBI KERNEL_IN_UBI \ BLOCKSIZE PAGESIZE SUBPAGESIZE \ UBINIZE_OPTS diff --git a/target/linux/arc770/image/Makefile b/target/linux/arc770/image/Makefile index 47c936e556..1e44d6abd5 100644 --- a/target/linux/arc770/image/Makefile +++ b/target/linux/arc770/image/Makefile @@ -24,9 +24,8 @@ define Device/Default PROFILES = Default $$(DEVICE_PROFILE) KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) DEVICE_PROFILE := - DEVICE_DTS := endef -DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS +DEVICE_VARS += DEVICE_PROFILE define Device/vmlinux KERNEL_SUFFIX := .elf diff --git a/target/linux/archs38/image/Makefile b/target/linux/archs38/image/Makefile index 03bd8ee8eb..42b13e618d 100644 --- a/target/linux/archs38/image/Makefile +++ b/target/linux/archs38/image/Makefile @@ -24,9 +24,8 @@ define Device/Default PROFILES = Default $$(DEVICE_PROFILE) KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) DEVICE_PROFILE := - DEVICE_DTS := endef -DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS +DEVICE_VARS += DEVICE_PROFILE define Device/vmlinux KERNEL_SUFFIX := .elf diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index 0709643b29..89639f4344 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -68,7 +68,7 @@ define Build/seama-nand -i $@.entity endef -DEVICE_VARS += DEVICE_DTS PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION +DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION define Device/Default # .dtb files are prefixed by SoC type, e.g. bcm4708- which is not included in device/image names diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index 6916a2b4ae..7656211310 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -49,9 +49,7 @@ define Device/Default KERNEL := kernel-bin | kernel-img IMAGES := sdcard.img IMAGE/sdcard.img := boot-img | sdcard-img - DEVICE_DTS := endef -DEVICE_VARS += DEVICE_DTS define Device/rpi DEVICE_TITLE := Raspberry Pi B/B+/CM/Zero diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 2c82c34363..5a1918c90b 100644 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -165,10 +165,8 @@ define Device/Default PROFILES = Default $$(DEVICE_NAME) KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) KERNEL_INITRAMFS_SUFFIX := .elf - DEVICE_DTS := DEVICE_DTS_DIR := ../dts endef -DEVICE_VARS += DEVICE_DTS DEVICE_DTS_DIR ATH5K_PACKAGES := kmod-ath5k wpad-mini ATH9K_PACKAGES := kmod-ath9k wpad-mini diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile index ff70b88170..9122d9673a 100644 --- a/target/linux/imx6/image/Makefile +++ b/target/linux/imx6/image/Makefile @@ -103,7 +103,6 @@ KERNEL_LOADADDR=0x10008000 define Device/Default PROFILES := Generic - DEVICE_DTS := FILESYSTEMS := squashfs ext4 KERNEL_INSTALL := 1 KERNEL_SUFFIX := -uImage @@ -114,8 +113,6 @@ define Device/Default IMAGES := endef -DEVICE_VARS += DEVICE_DTS - define Device/ventana DEVICE_TITLE := Gateworks Ventana family DEVICE_DTS:= \ diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 0b7c9ef9a0..f527fb648f 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -39,13 +39,12 @@ define Device/Default PROFILES := Default KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs - DEVICE_DTS := KERNEL_PREFIX := $$(IMAGE_PREFIX) IMAGES := KERNEL_IN_UBI := BOARD_NAME := endef -DEVICE_VARS += DEVICE_DTS BOARD_NAME KERNEL_SIZE +DEVICE_VARS += BOARD_NAME KERNEL_SIZE define Device/LegacyImage KERNEL_SUFFIX := -uImage @@ -165,7 +164,6 @@ define Device/EA8500 DEVICE_TITLE := Linksys EA8500 DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef -DEVICE_VARS += DEVICE_DTS define Device/R7500 $(call Device/DniImage) diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 0c95dd3d6d..2b0c0d9be5 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -10,7 +10,7 @@ NAND_BLOCKSIZE := 2048-128k include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -DEVICE_VARS += DEVICE_DTS KERNEL_SIZE +DEVICE_VARS += KERNEL_SIZE KERNEL_LOADADDR:=0x8000 TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome @@ -20,7 +20,6 @@ define Device/Default KERNEL_NAME := zImage KERNEL_SUFFIX := -uImage KERNEL_INSTALL := 1 - KERNEL_IN_UBI := endef define Device/dockstar diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index 7cd08c15f6..95895c223b 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -213,7 +213,7 @@ define Device/Default IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef -DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS DEVICE_DTS_DIR IMAGE_SIZE +DEVICE_VARS += DEVICE_PROFILE IMAGE_SIZE define Device/lantiqBrnImage KERNEL := kernel-bin | append-dtb | mkbrncmdline | lzma-no-dict diff --git a/target/linux/zynq/image/Makefile b/target/linux/zynq/image/Makefile index d803c336b8..6f4a909eff 100644 --- a/target/linux/zynq/image/Makefile +++ b/target/linux/zynq/image/Makefile @@ -54,10 +54,8 @@ KERNEL_ENTRY_POINT=0x8000 ### Device macros ### define Device/Default IMG_PREFIX := zynq - DEVICE_DTS := PROFILE_SANITIZED := endef -DEVICE_VARS += DEVICE_DTS define Device/DefaultConfig DEVICE_LC = $(1)