From 9958378c233871745b6042df411f7ea8b3fa6d28 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46564 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/image/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'target/linux/ar71xx/image/Makefile') diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 78069b8d3d..e894d78c62 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -4,13 +4,14 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + +JFFS2_BLOCKSIZE = 64k 128k 256k + include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default) -JFFS2_BLOCKSIZE = 64k 128k 256k - KERNEL_LOADADDR = 0x80060000 DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD NETGEAR_ID CMDLINE CONSOLE IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS -- cgit v1.2.3