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/ppc44x/image/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'target/linux/ppc44x') diff --git a/target/linux/ppc44x/image/Makefile b/target/linux/ppc44x/image/Makefile index b0513af..e2303f6 100644 --- a/target/linux/ppc44x/image/Makefile +++ b/target/linux/ppc44x/image/Makefile @@ -4,10 +4,12 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + +JFFS2_BLOCKSIZE=256k + include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -JFFS2_BLOCKSIZE=256k define Image/Prepare $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(DTS_DIR)/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb -- cgit v1.1