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/mcs814x/image/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'target/linux/mcs814x/image') diff --git a/target/linux/mcs814x/image/Makefile b/target/linux/mcs814x/image/Makefile index 4c8af97d22..017a564f09 100644 --- a/target/linux/mcs814x/image/Makefile +++ b/target/linux/mcs814x/image/Makefile @@ -4,6 +4,9 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + +JFFS2_BLOCKSIZE = 128k + include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk @@ -13,8 +16,6 @@ DTBS_DIR:=dts/ LOADADDR:=0x00008000 -JFFS2_BLOCKSIZE = 128k - UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage define Image/Build/MkuImage -- cgit v1.2.3