From dbe4173b206b4180e1ce03e545b63ab40ccb1cc1 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 5 Aug 2015 13:55:52 +0000 Subject: image: fix jffs2(_nand) image generation Variables dependend on JFFS2_BLOCKSIZE and NANDBLOCK_SIZE are used for template generation, so need to be present before inclusion of image.mk in target image Makefiles. So move all declarations to before any includes. Fixes: r42878 ("image.mk: clean up and parallelize mkfs calls") Signed-off-by: Jonas Gorski SVN-Revision: 46564 --- target/linux/xburst/image/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'target/linux/xburst/image') diff --git a/target/linux/xburst/image/Makefile b/target/linux/xburst/image/Makefile index 3795454c07..0853607506 100644 --- a/target/linux/xburst/image/Makefile +++ b/target/linux/xburst/image/Makefile @@ -4,11 +4,12 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/image.mk JFFS2_BLOCKSIZE=256k 512k +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/image.mk + ifneq ($(CONFIG_TARGET_xburst_qi_lb60),) UBI_OPTS = -m 4096 -p 512KiB UBIFS_OPTS = -m 4096 -e 516096 -c 4095 -- cgit v1.2.3