aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-13 17:19:00 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-14 10:27:30 +0200
commite0ed6ec667c74ae48694808626d3bf00bea12b2b (patch)
treed6ba198cad2a3b299434804c56a0f41fcc9574cf /include
parent1729a089fe087f36e09c7811b6aca89524edc181 (diff)
downloadupstream-e0ed6ec667c74ae48694808626d3bf00bea12b2b.tar.gz
upstream-e0ed6ec667c74ae48694808626d3bf00bea12b2b.tar.bz2
upstream-e0ed6ec667c74ae48694808626d3bf00bea12b2b.zip
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 <nbd@nbd.name>
Diffstat (limited to 'include')
-rw-r--r--include/image.mk13
1 files changed, 12 insertions, 1 deletions
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