From e0ed6ec667c74ae48694808626d3bf00bea12b2b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 13 Jul 2016 17:19:00 +0200 Subject: image: clean up UBI related device variable definitions Move UBI related variable export to core, since the variables are used by a core Build/ template Signed-off-by: Felix Fietkau --- include/image.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index a47d588488..a1e00df716 100644 --- a/include/image.mk +++ b/include/image.mk @@ -322,15 +322,26 @@ define Device/Init KERNEL_DEPENDS := KERNEL_SIZE := + UBOOTENV_IN_UBI := + KERNEL_IN_UBI := + BLOCKSIZE := + PAGESIZE := + SUBPAGESIZE := + FILESYSTEMS := $(TARGET_FILESYSTEMS) endef +DEFAULT_DEVICE_VARS := \ + DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \ + UBOOTENV_IN_UBI KERNEL_IN_UBI \ + BLOCKSIZE PAGESIZE SUBPAGESIZE + define Device/ExportVar $(1) : $(2):=$$($(2)) endef define Device/Export - $(foreach var,$(DEVICE_VARS) DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE,$(call Device/ExportVar,$(1),$(var))) + $(foreach var,$(DEVICE_VARS) $(DEFAULT_DEVICE_VARS),$(call Device/ExportVar,$(1),$(var))) $(1) : FILESYSTEM:=$(2) endef -- cgit v1.2.3