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/xburst/image | |
| 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/xburst/image')
| -rw-r--r-- | target/linux/xburst/image/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
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 |