diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-05 13:55:52 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-05 13:55:52 +0000 |
| commit | dbe4173b206b4180e1ce03e545b63ab40ccb1cc1 (patch) | |
| tree | e5107e4b2e3379b96a3bab6ff7abcf87f03242af /target/linux/ar71xx | |
| parent | 3368b4799b527a4179d9eac77acc90ce81125964 (diff) | |
| download | upstream-dbe4173b206b4180e1ce03e545b63ab40ccb1cc1.tar.gz upstream-dbe4173b206b4180e1ce03e545b63ab40ccb1cc1.tar.bz2 upstream-dbe4173b206b4180e1ce03e545b63ab40ccb1cc1.zip | |
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 <jogo@openwrt.org>
SVN-Revision: 46564
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
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 |