KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

image.mk: clean up redundant code related to DEVICE_DTS

Browse source 
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 <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-14 13:58:23 +02:00
parent 7ed215437c
commit 8e2764ce9b
11 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/image.mk
View file

@ -329,11 +329,15 @@ define Device/Init
SUBPAGESIZE := SUBPAGESIZE :=
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
DEVICE_DTS :=
DEVICE_DTS_DIR :=
FILESYSTEMS := $(TARGET_FILESYSTEMS) FILESYSTEMS := $(TARGET_FILESYSTEMS)
endef endef
DEFAULT_DEVICE_VARS := \ DEFAULT_DEVICE_VARS := \
DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \ DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \
DEVICE_DTS DEVICE_DTS_DIR \
UBOOTENV_IN_UBI KERNEL_IN_UBI \ UBOOTENV_IN_UBI KERNEL_IN_UBI \
BLOCKSIZE PAGESIZE SUBPAGESIZE \ BLOCKSIZE PAGESIZE SUBPAGESIZE \
UBINIZE_OPTS UBINIZE_OPTS

3
target/linux/arc770/image/Makefile
View file

@ -24,9 +24,8 @@ define Device/Default
PROFILES = Default $$(DEVICE_PROFILE) PROFILES = Default $$(DEVICE_PROFILE)
KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
DEVICE_PROFILE := DEVICE_PROFILE :=
DEVICE_DTS :=
endef endef
DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS DEVICE_VARS += DEVICE_PROFILE
define Device/vmlinux define Device/vmlinux
KERNEL_SUFFIX := .elf KERNEL_SUFFIX := .elf

3
target/linux/archs38/image/Makefile
View file

@ -24,9 +24,8 @@ define Device/Default
PROFILES = Default $$(DEVICE_PROFILE) PROFILES = Default $$(DEVICE_PROFILE)
KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
DEVICE_PROFILE := DEVICE_PROFILE :=
DEVICE_DTS :=
endef endef
DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS DEVICE_VARS += DEVICE_PROFILE
define Device/vmlinux define Device/vmlinux
KERNEL_SUFFIX := .elf KERNEL_SUFFIX := .elf

2
target/linux/bcm53xx/image/Makefile
View file

@ -68,7 +68,7 @@ define Build/seama-nand
-i $@.entity -i $@.entity
endef endef
DEVICE_VARS += DEVICE_DTS PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION
define Device/Default define Device/Default
# .dtb files are prefixed by SoC type, e.g. bcm4708- which is not included in device/image names # .dtb files are prefixed by SoC type, e.g. bcm4708- which is not included in device/image names

2
target/linux/brcm2708/image/Makefile
View file

@ -49,9 +49,7 @@ define Device/Default
KERNEL := kernel-bin | kernel-img KERNEL := kernel-bin | kernel-img
IMAGES := sdcard.img IMAGES := sdcard.img
IMAGE/sdcard.img := boot-img | sdcard-img IMAGE/sdcard.img := boot-img | sdcard-img
DEVICE_DTS :=
endef endef
DEVICE_VARS += DEVICE_DTS
define Device/rpi define Device/rpi
DEVICE_TITLE := Raspberry Pi B/B+/CM/Zero DEVICE_TITLE := Raspberry Pi B/B+/CM/Zero

2
target/linux/brcm63xx/image/Makefile
View file

@ -165,10 +165,8 @@ define Device/Default
PROFILES = Default $$(DEVICE_NAME) PROFILES = Default $$(DEVICE_NAME)
KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
KERNEL_INITRAMFS_SUFFIX := .elf KERNEL_INITRAMFS_SUFFIX := .elf
DEVICE_DTS :=
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
endef endef
DEVICE_VARS += DEVICE_DTS DEVICE_DTS_DIR
ATH5K_PACKAGES := kmod-ath5k wpad-mini ATH5K_PACKAGES := kmod-ath5k wpad-mini
ATH9K_PACKAGES := kmod-ath9k wpad-mini ATH9K_PACKAGES := kmod-ath9k wpad-mini

3
target/linux/imx6/image/Makefile
View file

@ -103,7 +103,6 @@ KERNEL_LOADADDR=0x10008000
define Device/Default define Device/Default
PROFILES := Generic PROFILES := Generic
DEVICE_DTS :=
FILESYSTEMS := squashfs ext4 FILESYSTEMS := squashfs ext4
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
KERNEL_SUFFIX := -uImage KERNEL_SUFFIX := -uImage
@ -114,8 +113,6 @@ define Device/Default
IMAGES := IMAGES :=
endef endef
DEVICE_VARS += DEVICE_DTS
define Device/ventana define Device/ventana
DEVICE_TITLE := Gateworks Ventana family DEVICE_TITLE := Gateworks Ventana family
DEVICE_DTS:= \ DEVICE_DTS:= \

4
target/linux/ipq806x/image/Makefile
View file

@ -39,13 +39,12 @@ define Device/Default
PROFILES := Default PROFILES := Default
KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
DEVICE_DTS :=
KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_PREFIX := $$(IMAGE_PREFIX)
IMAGES := IMAGES :=
KERNEL_IN_UBI := KERNEL_IN_UBI :=
BOARD_NAME := BOARD_NAME :=
endef endef
DEVICE_VARS += DEVICE_DTS BOARD_NAME KERNEL_SIZE DEVICE_VARS += BOARD_NAME KERNEL_SIZE
define Device/LegacyImage define Device/LegacyImage
KERNEL_SUFFIX := -uImage KERNEL_SUFFIX := -uImage
@ -165,7 +164,6 @@ define Device/EA8500
DEVICE_TITLE := Linksys EA8500 DEVICE_TITLE := Linksys EA8500
DEVICE_PACKAGES := ath10k-firmware-qca99x0 DEVICE_PACKAGES := ath10k-firmware-qca99x0
endef endef
DEVICE_VARS += DEVICE_DTS
define Device/R7500 define Device/R7500
$(call Device/DniImage) $(call Device/DniImage)

3
target/linux/kirkwood/image/Makefile
View file

@ -10,7 +10,7 @@ NAND_BLOCKSIZE := 2048-128k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
DEVICE_VARS += DEVICE_DTS KERNEL_SIZE DEVICE_VARS += KERNEL_SIZE
KERNEL_LOADADDR:=0x8000 KERNEL_LOADADDR:=0x8000
TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome
@ -20,7 +20,6 @@ define Device/Default
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL_SUFFIX := -uImage KERNEL_SUFFIX := -uImage
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
KERNEL_IN_UBI :=
endef endef
define Device/dockstar define Device/dockstar

2
target/linux/lantiq/image/Makefile
View file

@ -213,7 +213,7 @@ define Device/Default
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
endef endef
DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS DEVICE_DTS_DIR IMAGE_SIZE DEVICE_VARS += DEVICE_PROFILE IMAGE_SIZE
define Device/lantiqBrnImage define Device/lantiqBrnImage
KERNEL := kernel-bin | append-dtb | mkbrncmdline | lzma-no-dict KERNEL := kernel-bin | append-dtb | mkbrncmdline | lzma-no-dict

2
target/linux/zynq/image/Makefile
View file

@ -54,10 +54,8 @@ KERNEL_ENTRY_POINT=0x8000
### Device macros ### ### Device macros ###
define Device/Default define Device/Default
IMG_PREFIX := zynq IMG_PREFIX := zynq
DEVICE_DTS :=
PROFILE_SANITIZED := PROFILE_SANITIZED :=
endef endef
DEVICE_VARS += DEVICE_DTS
define Device/DefaultConfig define Device/DefaultConfig
DEVICE_LC = $(1) DEVICE_LC = $(1)